Enable SMB shares for user homes

machine/catacomb/default.nix

@@ -84,7 +84,7 @@ in {
 
   services.rsyncd.enable = true;
 
-  /*services.samba =
+  services.samba =
     let
       sambaShare = path: validUsers: {
         path = path;
@@ -137,25 +137,30 @@ in {
         max log size = 64
 
         hide dot files = no
-        hosts allow = 10.7.3.
+        hosts allow = 10.22.20., 192.168.1.
         map archive = no
         unix extensions = yes
 
 	ntlm auth = yes
       '';
-      shares = {
+      shares = let
-        audioRO = sambaShareRO "/nas/audio" ''@nas'';
+        homeShare = user: {
-        docRO = sambaShareRO "/nas/doc/" ''@nas'';
+          path = "/home/${user}";
-        gameRO = sambaShareRO "/nas/game/" ''@nas'';
+          comment = "${user}'s home folder";
-        imageRO = sambaShareRO "/nas/image" ''@nas'';
+          browseable = "yes";
-        videoRO = sambaShareRO "/nas/video" ''@nas'';
+          "read only" = "no";
-        #audio = sambaShare "/nas/audio" ''@nas'';
+          "guest okay" = "no";
-        #doc = sambaShare "/nas/doc/" ''@nas'';
+          "create mask" = "0640";
-        #game = sambaShare "/nas/game/" ''@nas'';
+          "force create mode" = "0640";
-        #image = sambaShare "/nas/image" ''@nas'';
+          "directory mask" = "0750";
-        #video = sambaShare "/nas/video" ''@nas'';
+          "force directory mode" = "0750";
+          "valid users" = "${user}";
+        };
+      in {
+        tvb = homeShare "tvb";
+        katydid = homeShare "katydid";
+      };
     };
-    };*/
 
   services.nebula.networks.beatific = lib.recursiveUpdate beatific.nebula-defaults {
     enable = true;
@@ -200,6 +205,11 @@ in {
   };
   #./keys/tvb.empyrean.pub
 
+  users.users.katydid = {
+    isNormalUser = true;
+    uid = 1002;
+  };
+
   nix.settings.cores = 4;
   nix.extraOptions = "experimental-features = nix-command flakes";
 }

machine/catacomb/hardware-configuration.nix

@@ -18,6 +18,66 @@
       fsType = "ext4";
     };
 
+  fileSystems."/home/katydid" =
+    { device = "catapool/user/katydid";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas" =
+    { device = "catapool/nas";
+      fsType = "zfs";
+    };
+
+  fileSystems."/backup" =
+    { device = "catapool/backup";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home/katydid/audio" =
+    { device = "catapool/user/katydid/audio";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home/katydid/doc" =
+    { device = "catapool/user/katydid/doc";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home/katydid/image" =
+    { device = "catapool/user/katydid/image";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home/katydid/video" =
+    { device = "catapool/user/katydid/video";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/video" =
+    { device = "catapool/nas/video";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/doc" =
+    { device = "catapool/nas/doc";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/image" =
+    { device = "catapool/nas/image";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/audio" =
+    { device = "catapool/nas/audio";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/game" =
+    { device = "catapool/nas/game";
+      fsType = "zfs";
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -26,6 +86,7 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.nebula.beatific.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";