3/20

nixos/modules/net.nix

@@ -1,5 +1,14 @@
-{ host, pkgs, config, lib, ...}:
-let cfg = config.machine.net; in {
+{
+  host,
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.machine.net;
+in
+{
   options.machine.net = {
     enable = lib.mkOption {
       type = lib.types.bool;
@@ -16,7 +25,7 @@ let cfg = config.machine.net; in {
       };
       ports = lib.mkOption {
         type = lib.types.listOf lib.types.int;
-        default = [22];
+        default = [ 22 ];
       };
     };
     tailscale = lib.mkOption {
@@ -85,21 +94,25 @@ let cfg = config.machine.net; in {
       };
     };
     systemd = {
-      mounts = [{
-        type = "nfs";
-        mountConfig = {
-          Options = "noatime";
-        };
-        what = "consensus:/rice";
-        where = "/mnt/rice";
-      }];
-      automounts = [{
-        wantedBy = [ "multi-user.target" ];
-        automountConfig = {
-          TimeoutIdleSec = "600";
-        };
-        where = "/mnt/rice";
-      }];
+      mounts = [
+        {
+          type = "nfs";
+          mountConfig = {
+            Options = "noatime";
+          };
+          what = "zen:/tank/home";
+          where = "/mnt/home";
+        }
+      ];
+      automounts = [
+        {
+          wantedBy = [ "multi-user.target" ];
+          automountConfig = {
+            TimeoutIdleSec = "600";
+          };
+          where = "/mnt/home";
+        }
+      ];
     };
   };
 }

nixos/modules/system.nix

@@ -19,7 +19,7 @@ in
     };
     swap = lib.mkOption {
       type = lib.types.bool;
-      default = false;
+      default = true;
     };
     zram = lib.mkOption {
       type = lib.types.bool;