diff --git a/home/hosts/linux/k3s-test-1-worker-1.nix b/home/hosts/linux/k3s-test-1-worker-1.nix deleted file mode 100644 index a67103bf..00000000 --- a/home/hosts/linux/k3s-test-1-worker-1.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ../../linux/core.nix ]; -} diff --git a/home/hosts/linux/k3s-test-1-worker-2.nix b/home/hosts/linux/k3s-test-1-worker-2.nix deleted file mode 100644 index a67103bf..00000000 --- a/home/hosts/linux/k3s-test-1-worker-2.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ../../linux/core.nix ]; -} diff --git a/home/hosts/linux/k3s-test-1-worker-3.nix b/home/hosts/linux/k3s-test-1-worker-3.nix deleted file mode 100644 index a67103bf..00000000 --- a/home/hosts/linux/k3s-test-1-worker-3.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ../../linux/core.nix ]; -} diff --git a/outputs/README.md b/outputs/README.md index 5a399154..daa4882e 100644 --- a/outputs/README.md +++ b/outputs/README.md @@ -49,7 +49,7 @@ them. Others name specific hosts and only cover a new host if you add it. | Kind | Tests | | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Every configuration | `hostname`, `kernel`, `nix-system-features`, `security-apparmor`, `security-container-groups`, `security-exporters`, `security-firewall`, `security-k3s-kubeconfig`, `security-k3s-pod-firewall`, `security-kernel`, `security-ssh-x11` | -| Named hosts only | `btrbk`, `home-manager`, `home-manager-xdg`, `computer-use-headless`, `k3s-api-endpoint`, `k3s-master-home-manager`, `idols-ai-gpu`, `idols-ai-voice-input`, `security-postgres-auth`, `youko-metrics`, `ups-metrics`, `shoukei-logind` | +| Named hosts only | `btrbk`, `home-manager`, `home-manager-xdg`, `computer-use-headless`, `k3s-api-endpoint`, `k3s-node-home-manager`, `idols-ai-gpu`, `idols-ai-voice-input`, `security-postgres-auth`, `youko-metrics`, `ups-metrics`, `shoukei-logind` | `hostname` expects each configuration's `networking.hostName` to equal its name. Niri desktop configurations are the exception (`ai-niri` → `ai`, `shoukei-niri` → `shoukei`) and are listed in diff --git a/outputs/x86_64-linux/src/k3s-test-1-worker-1.nix b/outputs/x86_64-linux/src/k3s-test-1-worker-1.nix index 92181322..959f3697 100644 --- a/outputs/x86_64-linux/src/k3s-test-1-worker-1.nix +++ b/outputs/x86_64-linux/src/k3s-test-1-worker-1.nix @@ -26,9 +26,6 @@ let inputs.microvm.nixosModules.microvm { modules.secrets.server.kubernetes.enable = true; } ]; - home-modules = map mylib.relativeToRoot [ - "home/hosts/linux/${name}.nix" - ]; }; systemArgs = modules // args; diff --git a/outputs/x86_64-linux/src/k3s-test-1-worker-2.nix b/outputs/x86_64-linux/src/k3s-test-1-worker-2.nix index 424de015..98abbfe0 100644 --- a/outputs/x86_64-linux/src/k3s-test-1-worker-2.nix +++ b/outputs/x86_64-linux/src/k3s-test-1-worker-2.nix @@ -26,9 +26,6 @@ let inputs.microvm.nixosModules.microvm { modules.secrets.server.kubernetes.enable = true; } ]; - home-modules = map mylib.relativeToRoot [ - "home/hosts/linux/${name}.nix" - ]; }; systemArgs = modules // args; diff --git a/outputs/x86_64-linux/src/k3s-test-1-worker-3.nix b/outputs/x86_64-linux/src/k3s-test-1-worker-3.nix index 977a0f9a..ae09edb0 100644 --- a/outputs/x86_64-linux/src/k3s-test-1-worker-3.nix +++ b/outputs/x86_64-linux/src/k3s-test-1-worker-3.nix @@ -26,9 +26,6 @@ let inputs.microvm.nixosModules.microvm { modules.secrets.server.kubernetes.enable = true; } ]; - home-modules = map mylib.relativeToRoot [ - "home/hosts/linux/${name}.nix" - ]; }; systemArgs = modules // args; diff --git a/outputs/x86_64-linux/tests/k3s-master-home-manager/expected.nix b/outputs/x86_64-linux/tests/k3s-node-home-manager/expected.nix similarity index 61% rename from outputs/x86_64-linux/tests/k3s-master-home-manager/expected.nix rename to outputs/x86_64-linux/tests/k3s-node-home-manager/expected.nix index 4263ce54..205823f9 100644 --- a/outputs/x86_64-linux/tests/k3s-master-home-manager/expected.nix +++ b/outputs/x86_64-linux/tests/k3s-node-home-manager/expected.nix @@ -3,4 +3,7 @@ lib.genAttrs [ "k3s-test-1-master-1" "k3s-test-1-master-2" "k3s-test-1-master-3" + "k3s-test-1-worker-1" + "k3s-test-1-worker-2" + "k3s-test-1-worker-3" ] (_: false) diff --git a/outputs/x86_64-linux/tests/k3s-master-home-manager/expr.nix b/outputs/x86_64-linux/tests/k3s-node-home-manager/expr.nix similarity index 77% rename from outputs/x86_64-linux/tests/k3s-master-home-manager/expr.nix rename to outputs/x86_64-linux/tests/k3s-node-home-manager/expr.nix index d3b9c593..cb1e4772 100644 --- a/outputs/x86_64-linux/tests/k3s-master-home-manager/expr.nix +++ b/outputs/x86_64-linux/tests/k3s-node-home-manager/expr.nix @@ -8,6 +8,9 @@ lib.genAttrs "k3s-test-1-master-1" "k3s-test-1-master-2" "k3s-test-1-master-3" + "k3s-test-1-worker-1" + "k3s-test-1-worker-2" + "k3s-test-1-worker-3" ] ( name: