catacomb: update to 23.05

flake.nix

@@ -41,7 +41,7 @@
           ./machine/backyard
         ];
       };
-      catacomb = nixpkgs.lib.nixosSystem {
+      catacomb = nixpkgs-next.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [
           self.nixosModules.beatific

machine/catacomb/hardware-configuration.nix

@@ -18,6 +18,11 @@
       fsType = "ext4";
     };
 
+  fileSystems."/backup" =
+    { device = "catapool/backup";
+      fsType = "zfs";
+    };
+
   fileSystems."/home/katydid" =
     { device = "catapool/user/katydid";
       fsType = "zfs";
@@ -28,41 +33,6 @@
       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";
@@ -73,11 +43,21 @@
       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