Merge remote-tracking branch 'orange/master'

1 files changed, 37 insertions, 35 deletions

diff --git a/lass/1systems/neoprism/disk.nix b/lass/1systems/neoprism/disk.nix
index cf9a8cef4..c5bd44c94 100644
--- a/lass/1systems/neoprism/disk.nix
+++ b/lass/1systems/neoprism/disk.nix
@@ -4,40 +4,27 @@
     type = "disk";
     device = disk;
     content = {
-      type = "table";
-      format = "gpt";
-      partitions = [
-        {
-          name = "boot";
-          type = "partition";
-          start = "0";
-          end = "1M";
-          part-type = "primary";
-          flags = ["bios_grub"];
-        }
-        {
-          type = "partition";
-          name = "ESP";
-          start = "1M";
-          end = "1GiB";
-          fs-type = "fat32";
-          bootable = true;
+      type = "gpt";
+      partitions = {
+        boot = {
+          size = "1M";
+          type = "EF02";
+        };
+        ESP = {
+          size = "1G";
           content = {
             type = "mdraid";
             name = "boot";
           };
-        }
-        {
-          type = "partition";
-          name = "zfs";
-          start = "1GiB";
-          end = "100%";
+        };
+        zfs = {
+          size = "100%";
           content = {
             type = "zfs";
             pool = "zroot";
           };
-        }
-      ];
+        };
+      };
     };
   })) // {
     hdd1 = {
@@ -69,7 +56,7 @@
       rootFsOptions = {
       };
       datasets.reserved = {
-        zfs_type = "filesystem";
+        type = "zfs_fs";
         options.refreservation = "1G";
       };
     };
@@ -77,38 +64,53 @@
       type = "zpool";
       datasets = {
         reserved = {
-          zfs_type = "filesystem";
+          type = "zfs_fs";
           options.refreservation = "1G";
         };
         containers = {
-          zfs_type = "filesystem";
+          type = "zfs_fs";
           mountpoint = "/var/lib/containers";
+          options = {
+            canmount = "noauto";
+          };
         };
         home = {
-          zfs_type = "filesystem";
+          type = "zfs_fs";
           mountpoint = "/home";
+          options = {
+            canmount = "noauto";
+          };
         };
         srv = {
-          zfs_type = "filesystem";
+          type = "zfs_fs";
           mountpoint = "/srv";
+          options = {
+            canmount = "noauto";
+          };
         };
         libvirt = {
-          zfs_type = "filesystem";
+          type = "zfs_fs";
           mountpoint = "/var/lib/libvirt";
+          options = {
+            canmount = "noauto";
+          };
         };
         # encrypted = {
-        #   zfs_type = "filesystem";
+        #   type = "zfs_fs";
         #   options = {
+        #     canmount = "noauto";
         #     mountpoint = "none";
         #     encryption = "aes-256-gcm";
         #     keyformat = "passphrase";
         #     keylocation = "prompt";
         #   };
         # };
-
         # "encrypted/download" = {
-        #   zfs_type = "filesystem";
+        #   type = "zfs_fs";
         #   mountpoint = "/var/download";
+        #   options = {
+        #     canmount = "noauto";
+        #   };
         # };
       };
     };