marie-nas: use ext4 on luks for rootfs (temporarily)

Author: NyCodeGHG

hosts/marie-nas/disko.nix

@@ -31,11 +31,12 @@
                 name = "root";
                 settings = {
                   allowDiscards = true;
-                  keyFile = "/encryption-keys/root.key";
+                  keyFile = "/mnt/encryption-keys/root.key";
                 };
                 content = {
-                  type = "zfs";
-                  pool = "zroot";
+                  type = "filesystem";
+                  format = "ext4";
+                  mountpoint = "/";
                 };
               };
             };
@@ -46,32 +47,32 @@
         type = "disk";
         device = "/dev/disk/by-id/ata-WDC_WD120EFBX-68B0EN0_D7JPDSJN";
         content = {
-          type = "luks";
-          name = "wd-red-plus-a";
-          settings = {
-            allowDiscards = true;
-            keyFile = "/encryption-keys/wd-red-plus-a.key";
-          };
-          content = {
+          # type = "luks";
+          # name = "wd-red-plus-a";
+          # settings = {
+          #   allowDiscards = true;
+          #   keyFile = "/mnt/encryption-keys/wd-red-plus-a.key";
+          # };
+          # content = {
             type = "zfs";
             pool = "tank";
-          };
+          # };
         };
       };
       wd-red-plus-b = {
         type = "disk";
         device = "/dev/disk/by-id/ata-WDC_WD120EFBX-68B0EN0_D7JLAHXN";
         content = {
-          type = "luks";
-          name = "wd-red-plus-b";
-          settings = {
-            allowDiscards = true;
-            keyFile = "/encryption-keys/wd-red-plus-b.key";
-          };
-          content = {
+          # type = "luks";
+          # name = "wd-red-plus-b";
+          # settings = {
+          #   allowDiscards = true;
+          #   keyFile = "/mnt/encryption-keys/wd-red-plus-b.key";
+          # };
+          # content = {
             type = "zfs";
             pool = "tank";
-          };
+          # };
         };
       };
     };
@@ -87,27 +88,27 @@
         };
       in
       {
-        zroot = {
-          type = "zpool";
-          rootFsOptions = options;
-          options.ashift = "12";
-          postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank";
+        # zroot = {
+        #   type = "zpool";
+        #   rootFsOptions = options;
+        #   options.ashift = "12";
+        #   postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank";
 
-          datasets = {
-            "local/nix" = {
-              type = "zfs_fs";
-              mountpoint = "/nix";
-            };
-            "local/root" = {
-              type = "zfs_fs";
-              mountpoint = "/";
-            };
-            "data/state" = {
-              type = "zfs_fs";
-              mountpoint = "/state";
-            };
-          };
-        };
+        #   datasets = {
+        #     "local/nix" = {
+        #       type = "zfs_fs";
+        #       mountpoint = "/nix";
+        #     };
+        #     "local/root" = {
+        #       type = "zfs_fs";
+        #       mountpoint = "/";
+        #     };
+        #     "data/state" = {
+        #       type = "zfs_fs";
+        #       mountpoint = "/state";
+        #     };
+        #   };
+        # };
         tank = {
           type = "zpool";
           mode = "mirror";
@@ -118,17 +119,20 @@
             "data/shares" = {
               type = "zfs_fs";
               mountpoint = "/srv/shares";
+              options.mountpoint = "legacy";
             };
             "data/shares/media" = {
               type = "zfs_fs";
               mountpoint = "/srv/shares/media";
               options = {
                 recordsize = "1M";
+                mountpoint = "legacy";
               };
             };
             "data/shares/marie" = {
               type = "zfs_fs";
               mountpoint = "/srv/shares/marie";
+              options.mountpoint = "legacy";
             };
           };
         };

hosts/marie-nas/filesystems.nix

@@ -11,21 +11,26 @@
     };
   };
   fileSystems = {
+    # "/" = {
+    #   device = "zroot/local/root";
+    #   fsType = "zfs";
+    #   neededForBoot = true;
+    # };
     "/" = {
-      device = "zroot/local/root";
-      fsType = "zfs";
-      neededForBoot = true;
+      device = "/dev/mapper/root";
+      fsType = "ext4";
+      options = [ "defaults" ];
     };
     "/boot" = {
       device = "/dev/disk/by-partlabel/disk-boot-esp";
       fsType = "vfat";
       options = [ "umask=0077" ];
     };
-    "/nix" = {
-      device = "zroot/local/nix";
-      fsType = "zfs";
-      neededForBoot = true;
-    };
+    # "/nix" = {
+    #   device = "zroot/local/nix";
+    #   fsType = "zfs";
+    #   neededForBoot = true;
+    # };
     "/srv/shares" = {
       device = "tank/data/shares";
       fsType = "zfs";
@@ -41,11 +46,11 @@
       fsType = "zfs";
       options = [ "nofail" ];
     };
-    "/state" = {
-      device = "zroot/data/state";
-      fsType = "zfs";
-      neededForBoot = true;
-    };
+    # "/state" = {
+    #   device = "zroot/data/state";
+    #   fsType = "zfs";
+    #   neededForBoot = true;
+    # };
   };
   swapDevices = [
     {