1 files changed, 54 insertions, 81 deletions
diff --git a/hosts/canadian-government-system/disks.nix b/hosts/canadian-government-system/disks.nix
index 3a12aff..67b20b8 100644
--- a/hosts/canadian-government-system/disks.nix
+++ b/hosts/canadian-government-system/disks.nix
@@ -1,109 +1,82 @@
 {
-  disko.devices = {
-    disk = {
-      boot1 = {
-        content = {
-          partitions = {
-            boot = {
-              content = {
-                format = "vfat";
-                mountOptions = [ "umask=0077" ];
-                mountpoint = "/boot";
-                type = "filesystem";
-              };
-
-              size = "500M";
-              type = "EF00";
+  disko.devices.disk = {
+    boot1 = {
+      content = {
+        partitions = {
+          efi = {
+            content = {
+              format = "vfat";
+              mountOptions = [ "umask=0077" ];
+              mountpoint = "/boot";
+              type = "filesystem";
             };
 
-            root = {
-              content = {
-                name = "raid1";
-                type = "mdraid";
-              };
-
-              size = "100%";
-            };
+            size = "512M";
+            type = "EF00";
           };
 
-          type = "gpt";
+          # the root partition is set up in boot2
+          root.size = "100%";
         };
 
-        device = "/dev/sda";
-        type = "disk";
+        type = "gpt";
       };
 
-      boot2 = {
-        content = {
-          partitions = {
-            boot = {
-              content = {
-                format = "vfat";
-                mountOptions = [ "umask=0077" ];
-                mountpoint = "/boot";
-                type = "filesystem";
-              };
+      device = "/dev/sda";
+      type = "disk";
+    };
 
-              size = "500M";
-              type = "EF00";
+    boot2 = {
+      content = {
+        partitions = {
+          efi = {
+            content = {
+              format = "vfat";
+              mountOptions = [ "umask=0077" ];
+              mountpoint = "/boot";
+              type = "filesystem";
             };
 
-            root = {
-              content = {
-                name = "raid1";
-                type = "mdraid";
-              };
-
-              size = "100%";
-            };
+            size = "512M";
+            type = "EF00";
           };
 
-          type = "gpt";
-        };
-
-        device = "/dev/sdb";
-        type = "disk";
-      };
-
-      mass-storage = {
-        content = {
-          partitions.main = {
+          root = {
             content = {
-              format = "xfs";
-              mountOptions = [ "noatime" ];
-              mountpoint = "/mnt/mass-storage";
-              type = "filesystem";
-            };
+              extraArgs = [
+                "-f"
+                "-d raid1"
+                "/dev/sda2";
+              ];
 
-            size = "100%";
-          };
+              subvolumes = {
+                "/nix" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
 
-          type = "gpt";
-        };
+                  mountpoint = "/nix";
+                };
 
-        device = "/dev/sdc";
-        type = "disk";
-      };
-    };
+                "/root" = {
+                  mountpoint = "/";
+                  mountOptions = [ "noatime" ];
+                };
+              };
 
-    mdadm.raid1 = {
-      content = {
-        partitions.primary = {
-          content = {
-            format = "xfs";
-            mountOptions = [ "noatime" ];
-            mountpoint = "/";
-            type = "filesystem";
-          };
+              type = "btrfs";
+            };
 
-          size = "100%";
+            size = "100%";
+          };
         };
 
         type = "gpt";
       };
 
-      level = 1;
-      type = "mdadm";
+      device = "/dev/sdb";
+      type = "disk";
     };
   };
 }