k3s: some module cleanup

modules/nixos/my_k3s/default.nix

@@ -5,7 +5,6 @@
   ...
 }:
 let
-  cfg = config.my_k3s;
   inherit (lib)
     mkEnableOption
     mkIf
@@ -21,8 +20,11 @@ in
       type = types.nonEmptyStr;
     };
     role = mkOption {
-      type = types.nonEmptyStr;
+      type = types.enum [
-      default = "server";
+        "server"
+        "agent"
+      ];
+      default = "agent";
     };
     clusterInit = mkOption {
       type = types.bool;
@@ -32,6 +34,12 @@ in
       type = types.nonEmptyStr;
       default = "server";
     };
+    nodeIp = mkOption {
+      type = types.nonEmptyStr;
+    };
+    iface = mkOption {
+      type = types.nonEmptyStr;
+    };
     extraFlags = mkOption {
       type = types.listOf types.str;
       default = [ ];
@@ -40,38 +48,40 @@ in
       type = types.bool;
       default = false;
     };
-
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config =
-    {
+    let
-      services.k3s = {
+      cfg = config.my_k3s;
-        enable = true;
+      is_server = cfg.role == "server";
-        role = cfg.role;
+    in
-        tokenFile = cfg.tokenFile;
+    mkIf cfg.enable (mkMerge [
-        clusterInit = cfg.clusterInit;
+      {
-        serverAddr = cfg.serverAddr;
+        services.k3s = {
-        extraFlags = cfg.extraFlags;
+          enable = true;
-      };
+          role = cfg.role;
-      environment.systemPackages = [ pkgs.nfs-utils ];
+          tokenFile = cfg.tokenFile;
-      services.openiscsi = {
+          clusterInit = is_server && cfg.clusterInit;
-        enable = true;
+          serverAddr = cfg.serverAddr;
-        name = "iqn.2016-04.com.open-iscsi:${config.networking.hostName}";
+          extraFlags = [
-      };
+            "--node-ip ${cfg.nodeIp}"
-      systemd.tmpfiles.rules = [
+            "--flannel-iface ${cfg.iface}"
-        "L+ /usr/local/bin - - - - /run/current-system/sw/bin/"
+          ]
-      ];
+          ++ cfg.extraFlags;
-    }
+        };
-    (mkIf cfg.nvidia {
+        environment.systemPackages = [ pkgs.nfs-utils ];
-      hardware.nvidia-container-toolkit.enable = true;
+        services.openiscsi = {
-      hardware.nvidia-container-toolkit.mount-nvidia-executables = true;
+          enable = true;
-      # virtualisation.docker = {
+          name = "iqn.2016-04.com.open-iscsi:${config.networking.hostName}";
-      #   enable = true;
+        };
-      #   enableNvidia = true;
+        systemd.tmpfiles.rules = [
-      # };
+          "L+ /usr/local/bin - - - - /run/current-system/sw/bin/"
-      environment.systemPackages = with pkgs; [
+        ];
-        nvidia-container-toolkit
+      }
-      ];
+      (mkIf cfg.nvidia {
-    })
+        hardware.nvidia-container-toolkit.enable = true;
-  ]);
+        hardware.nvidia-container-toolkit.mount-nvidia-executables = true;
+        environment.systemPackages = [ pkgs.nvidia-container-toolkit ];
+      })
+    ]);
 }

systems/x86_64-linux/penguin/default.nix

@@ -37,10 +37,8 @@ in
       tokenFile = config.age.secrets.k3s.path;
       clusterInit = false;
       serverAddr = "https://10.222.0.13:6443";
-      extraFlags = [
+      nodeIp = "10.222.0.249";
-        "--node-ip 10.222.0.249"
+      iface = "ztxh6lvd6t";
-        "--flannel-iface ztxh6lvd6t"
-      ];
       nvidia = true;
     };
     networking.hostName = "penguin";