machine/catacomb/default.nix

@@ -7,7 +7,7 @@
   ];
 
   beatific.hostName = "catacomb";
-  beatific.defaults.tvbSync = false;
+  beatific.defaults.tvbSync = true;
 
   boot = {
     loader = {
@@ -18,7 +18,6 @@
     };
     supportedFilesystems = ["zfs"];
     zfs.enableUnstable = true;
-    zfs.extraPools = [ "catapool" ];
     kernelParams = [ "zfs.zfs_dmu_offset_next_sync=0" ];
   };
 

machine/catacomb/hardware-configuration.nix

@@ -18,6 +18,46 @@
       fsType = "ext4";
     };
 
+  fileSystems."/backup" =
+    { device = "catapool/backup";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home/katydid" =
+    { device = "catapool/user/katydid";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas" =
+    { device = "catapool/nas";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/image" =
+    { device = "catapool/nas/image";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/audio" =
+    { device = "catapool/nas/audio";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/doc" =
+    { device = "catapool/nas/doc";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/game" =
+    { device = "catapool/nas/game";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nas/video" =
+    { device = "catapool/nas/video";
+      fsType = "zfs";
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking