commit 6d301982fd6a0429c6785cf297bb8a8a3177105a
parent b5cc516e2041f8e43695efe61fa226d2c617137e
Author: Silas Brack <silasbrack@gmail.com>
Date: Wed, 8 Jan 2025 20:11:22 +0100
chore: clean up
Diffstat:
5 files changed, 5 insertions(+), 129 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
# My Project
- `nix develop`
- `nixos-shell --flake .`
+- `nixos-rebuild test --fast --flake .#nixos-s-1vcpu-512mb-10gb-ams3-01 --target-host root@188.166.127.72`
diff --git a/flake.nix b/flake.nix
@@ -19,18 +19,11 @@
}:
let
system = "x86_64-linux";
- # pkgs = import nixpkgs {
- # inherit system;
- # };
pkgs_24_05 = import nixpkgs_24_05 { inherit system; };
in
- # start = pkgs.writeShellScriptBin "start" ''
- # set -e
- # export QEMU_NET_OPTS="hostfwd=tcp::8080-:80"
- # ${pkgs_24_05.nixos-shell}/bin/nixos-shell --flake .
- # '';
{
- nixosConfigurations.default = nixpkgs.lib.nixosSystem {
+ # production configuration
+ nixosConfigurations.nixos-s-1vcpu-512mb-10gb-ams3-01 = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
sops-nix.nixosModules.sops
@@ -48,6 +41,7 @@
)
];
};
+ # development environment (nix develop)
devShells."${system}".default =
let
pkgs = import nixpkgs {
@@ -61,18 +55,9 @@
sops
wireguard-tools
squawk
- clang-tools
- cmake
- codespell
- conan
- cppcheck
- doxygen
- gtest
- lcov
- vcpkg
- vcpkg-tool
];
};
+ # nixos-shell VM configuration for locally testing apps in an isolated environment
nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
@@ -97,9 +82,5 @@
nixos-shell.nixosModules.nixos-shell
];
};
- # packages = {
- # inherit start;
- # };
- # defaultPackage."${system}" = start;
};
}
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
@@ -1,6 +1,5 @@
{
pkgs,
- sops,
modulesPath,
my_app,
...
@@ -65,7 +64,6 @@
"wheel"
]; # "keys"
openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFPYO29H4+yDvJbaoUqTg5V6IpD3CMFlB2F47MCzHNpY silasbrack@gmail.com" # Thinkpad (obsolete)
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtyTJ7fQ/dF4ObtXcjmjJ3OFtjkYEJdr/szcugDEA3C silasbrack@gmail.com" # Thinkpad
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqHJMc2SCzL50SO9Flfnhn012p1dmp4Iph8lPQ2aoe/ silasbrack@gmail.com" # Desktop
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZ0gNM0od3EE/LL27kYQ/s5MOU7LBNc0pWRWROeINij silas@Lorenzas-MacBook-Pro.local" # Lolo's Macbook Pro
@@ -77,16 +75,4 @@
package = my_app.packages."x86_64-linux".default;
port = 8009;
};
-
- services.nginx = {
- enable = true;
- virtualHosts."localhost" = {
- locations."/" = {
- return = "200 'Hello, NixOS!'";
- extraConfig = ''
- default_type text/plain;
- '';
- };
- };
- };
}
diff --git a/nixos/my_app.nix b/nixos/my_app.nix
@@ -75,24 +75,6 @@ in
};
systemd.services = {
- # clone-pokemon-app = {
- # wantedBy = [ "multi-user.target" ];
- # description = "Clone Pokemon app.";
- # after = [ "network.target" ];
- # serviceConfig = {
- # Type = "simple";
- # User = "root";
- # ExecStart = "";
- # };
- # script = ''
- # TMP_DIR=$(mktemp)
- # curl --output-dir $TMP_DIR ""
- # unzip
- # '';
- # # script = ''
- # # rsync
- # # '';
- # };
create-sqlite-db = {
wantedBy = [ "multi-user.target" ];
@@ -112,8 +94,6 @@ in
"network.target"
"create-sqlite-db.service"
];
- # after = [ "clone-pokemon-app" ];
- # requires = [ "clone-pokemon-app" ];
serviceConfig = {
Type = "simple";
User = cfg.user;
@@ -123,75 +103,8 @@ in
PORT = builtins.toString cfg.port;
SQLITE_FILE_PATH = cfg.sqlite_file_path;
};
- # path = with pkgs; [ gleam erlang_27 rebar3 ];
};
- # postgres-migration = {
- # description = "Postgres migrations";
- # wantedBy = [ "multi-user.target" ];
- # after = [ "postgresql.service" ];
- # requires = [ "postgresql.service" ];
- # };
};
-
- # services = mkIf cfg.environment == "dev" {
- # postgresql = {
- # enable = true;
- # enableTCPIP = true;
- # ensureDatabases = [ cfg.user ];
- # ensureUsers = [
- # {
- # name = cfg.user;
- # ensurePermissions = {
- # "DATABASE ${cfg.user}" = "ALL PRIVILEGES";
- # };
- # }
- # ];
- # authentication = pkgs.lib.mkOverride 10 ''
- # local sameuser all peer
- # host sameuser all ::1/32 trust
- # '';
- # };
- # };
-
- # systemd.services = {
- #
- # # db-migration = {
- # # description = "DB migrations script";
- # # wantedBy = [ "multi-user.target" ];
- # # after = [ "postgresql.service" ];
- # # requires = [ "postgresql.service" ];
- # #
- # # environment = {
- # # DATABASE_URL = "postgres://${cfg.user}@localhost:5432/myapp?sslmode=disable";
- # # };
- # #
- # # serviceConfig = {
- # # User = cfg.user;
- # # Type = "oneshot";
- # # ExecStart = "${pkgs.dbmate}/bin/dbmate -d ${migrations} --no-dump-schema up";
- # # };
- # # };
- #
- # myapp = {
- # wantedBy = [ "multi-user.target" ];
- # description = "Start my app server.";
- # after = [ "network.target" ];
- # # requires = [ "db-migration.service" ];
- #
- # # environment = {
- # # APP_PORT = toString cfg.port;
- # # DATABASE_URL = "postgres:///${cfg.user}";
- # # };
- #
- # serviceConfig = {
- # Type = "simple";
- # User = cfg.user;
- # ExecStart = ''${server}/bin/server'';
- # Restart = "always";
- # KillMode = "process";
- # };
- # };
- # };
};
}
diff --git a/nixos/vpn.nix b/nixos/vpn.nix
@@ -14,11 +14,6 @@
51820
];
};
- # boot.kernel.sysctl = {
- # # "net.ipv4.ip_forward" = lib.mkOverride 98 true;
- # "net.ipv4.conf.all.forwarding" = lib.mkOverride 98 true;
- # "net.ipv4.conf.default.forwarding" = lib.mkOverride 98 true;
- # };
services.dnsmasq = {
enable = true;
settings = {
