diff --git a/flake.nix b/flake.nix index 037d75d..f09b37f 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,7 @@ nodeNames = [ "hl-minipc1" "hl-minipc2" + "hl-minipc3" "hl-terra1" "hl-bigbox1" ]; diff --git a/hosts/hl-minipc3.nix b/hosts/hl-minipc3.nix index 9e9afad..1fb1d14 100644 --- a/hosts/hl-minipc3.nix +++ b/hosts/hl-minipc3.nix @@ -8,6 +8,10 @@ skyg.nixos.common.ssh-server.enable = true; skyg.nixos.common.containers.openMetricsPort = true; skyg.server.exporters.enable = true; + skyg.nixos.server.k3s = { + enable = true; + envPath = "/opt/k3s/k3s.env"; + }; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/nixos/server/k3s/default.nix b/modules/nixos/server/k3s/default.nix index 7666db3..518d773 100644 --- a/modules/nixos/server/k3s/default.nix +++ b/modules/nixos/server/k3s/default.nix @@ -13,7 +13,6 @@ in }; envPath = lib.mkOption { type = lib.types.str; - default = "/mnt/EightTerra/k3s-cluster/configs/k3s.env"; }; }; }; @@ -32,16 +31,9 @@ in ]; in lib.mkIf cfg.enable { - system.activationScripts.k3sEnv = '' - set -e - mkdir -p /var/lib/k3s - cp ${cfg.envPath} /var/lib/k3s/.env - chmod 0644 /var/lib/k3s/.env - chown root:root /var/lib/k3s/.env - ''; services.k3s = { enable = true; - environmentFile = "/var/lib/k3s/.env"; + environmentFile = cfg.envPath; role = cfg.role; extraFlags = [ "--disable servicelb"