flake.nix

@@ -43,9 +43,6 @@
         node2 = kclib.mkHost {
           name = "node2";
         };
-        node-nfs = kclib.mkHost {
-          name = "node-nfs";
-        };
       };
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
       devShells.x86_64-linux.default =

hosts/base/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   ...
 }:
 {
@@ -33,9 +32,5 @@
 
   services.qemuGuest.enable = true;
 
-  environment.systemPackages = [
-    pkgs.nfs-utils
-  ];
-
   system.stateVersion = "24.11";
 }

hosts/node-nfs/default.nix

@@ -1,24 +0,0 @@
-{ ... }:
-{
-  kropcloud =
-    let
-      serverIp = "192.168.1.180";
-    in
-    {
-      drives.hasSecondDrive = true;
-      services = {
-        nfs = {
-          enable = true;
-          exportDirectory = "/mnt/nas";
-          clusterWildcard = "192.168.1.0/24";
-        };
-      };
-      networking = {
-        ipv4 = {
-          address = serverIp;
-          prefixLength = 24;
-          defaultGateway = "192.168.1.1";
-        };
-      };
-    };
-}

nixosModules/drives/default.nix

@@ -9,11 +9,6 @@ in
 {
   options.kropcloud.drives = {
     hasSecondDrive = lib.mkEnableOption "Whence this VM has second drive";
-    secondDriveMountpoint = lib.mkOption {
-      type = lib.types.str;
-      default = "/mnt/nas";
-      description = "The mountpoint for the second drive";
-    };
   };
   config = {
     disko.devices = {
@@ -50,22 +45,6 @@ in
             };
           };
         };
-        secondary = lib.mkIf cfg.hasSecondDrive {
-          type = "disk";
-          device = "/dev/sdb";
-          content = {
-            type = "gpt";
-            partitions = {
-              data = {
-                content = {
-                  type = "filesystem";
-                  format = "ext4";
-                  mountpoint = "/mnt/nas";
-                };
-              };
-            };
-          };
-        };
       };
     };
   };

nixosModules/networking/default.nix

@@ -52,40 +52,25 @@ in
 
     services.avahi = {
       enable = true;
-      openFirewall = true;
     };
 
     networking = {
       nftables.enable = true;
       firewall = {
         checkReversePath = "loose";
-        allowedUDPPorts =
+        allowedUDPPorts = []
-          [ ]
+        ++ lib.optionals kc_cfg.services.k3s.enable
-          ++ lib.optionals kc_cfg.services.k3s.enable [
+        [
-            8472
+          8472
-          ]
+        ];
-          ++ lib.optionals kc_cfg.services.nfs.enable [
+        allowedTCPPorts = []
-            4000
+        ++ lib.optionals kc_cfg.services.k3s.enable
-            4001
+        [
-            4002
+          2379
-            2049
+          2380
-            111
+          6443
-          ];
+          10250
-        allowedTCPPorts =
+        ];
-          [ ]
-          ++ lib.optionals kc_cfg.services.k3s.enable [
-            2379
-            2380
-            6443
-            10250
-          ]
-          ++ lib.optionals kc_cfg.services.nfs.enable [
-            4000
-            4001
-            4002
-            2049
-            111
-          ];
       };
       interfaces = {
         ens18 = {

nixosModules/services/default.nix

@@ -5,6 +5,5 @@
     ./tailscale
     ./hydra
     ./k3s
-    ./nfs
   ];
 }

nixosModules/services/k3s/default.nix

@@ -44,7 +44,10 @@ in
           "--disable local-storage"
         ]
         ++ (
-          if (!cfg.isMaster && cfg.master != null) then [ "--server https://${cfg.master}:6443" ] else [ ]
+          if (!cfg.isMaster && cfg.master != null) then
+            [ "--server https://${cfg.master}:6443" ]
+          else
+            [ ]
         )
       );
       clusterInit = cfg.isMaster;

nixosModules/services/nfs/default.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.kropcloud.services.nfs;
-  kc_cfg = config.kropcloud;
-in
-{
-  options.kropcloud.services.nfs = {
-    enable = lib.mkEnableOption "Whence to enable nfs service.";
-    exportDirectory = lib.mkOption {
-      type = lib.types.str;
-      default = "/mnt/nas";
-      description = "The directory to export.";
-    };
-    clusterWildcard = lib.mkOption {
-      type = lib.types.str;
-      default = "*";
-      description = "The wildcard to use for cluster.";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    services.nfs.server = {
-      enable = true;
-      exports = ''
-        ${cfg.exportDirectory} ${cfg.clusterWildcard}(rw,sync,no_wdelay,no_root_squash,insecure)
-      '';
-      statdPort = 4000;
-      lockdPort = 4001;
-      mountdPort = 4002;
-    };
-  };
-}

secrets/keys.json

@@ -7,8 +7,7 @@
     "test-server": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4ioqiTzYe6Y6H0YfFkWyDBbCB25wYs3gKNZIufE/Sn",
     "node0": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIITESdAzft5+WqMWM2A9Tix8BDWGnVv3z0IF8mqXwWA0",
     "node1": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxhznyKJwumO3jzm9kjH+lZJln7fypT8YKAdLNhVspU",
-    "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw",
+    "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw"
-    "node-nfs": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKv1xIg3+faoigxh6S9hUJMIPe2KP6Qb3PQtvFynkrtI"
   },
   "secrets": {
     "mypassword.age": [
@@ -17,17 +16,14 @@
       "servers:test-server",
       "servers:node0",
       "servers:node1",
-      "servers:node2",
+      "servers:node2"
-      "servers:node-nfs",
-      "servers:node-nfs"
     ],
     "k3stoken.age": [
       "hosts:wenar-nix",
       "hosts:lenar",
       "servers:node0",
       "servers:node1",
-      "servers:node2",
+      "servers:node2"
-      "servers:node-nfs"
     ]
   }
 }