1 files changed, 21 insertions, 33 deletions

diff --git a/hosts/canadian-government-system/disks.nix b/hosts/canadian-government-system/disks.nix
index 6e86a26..3a12aff 100644
--- a/hosts/canadian-government-system/disks.nix
+++ b/hosts/canadian-government-system/disks.nix
@@ -6,8 +6,10 @@
           partitions = {
             boot = {
               content = {
-                name = "boot";
-                type = "mdraid";
+                format = "vfat";
+                mountOptions = [ "umask=0077" ];
+                mountpoint = "/boot";
+                type = "filesystem";
               };
 
               size = "500M";
@@ -36,8 +38,10 @@
           partitions = {
             boot = {
               content = {
-                name = "boot";
-                type = "mdraid";
+                format = "vfat";
+                mountOptions = [ "umask=0077" ];
+                mountpoint = "/boot";
+                type = "filesystem";
               };
 
               size = "500M";
@@ -82,40 +86,24 @@
       };
     };
 
-    mdadm = {
-      boot = {
-        content = {
-          format = "vfat";
-          mountOptions = [ "umask=0077" ];
-          mountpoint = "/boot";
-          type = "filesystem";
-        };
-
-        level = 1;
-        metadata = "1.0";
-        type = "mdadm";
-      };
-
-      raid1 = {
-        content = {
-          partitions.primary = {
-            content = {
-              format = "xfs";
-              mountOptions = [ "noatime" ];
-              mountpoint = "/";
-              type = "filesystem";
-            };
-
-            size = "100%";
+    mdadm.raid1 = {
+      content = {
+        partitions.primary = {
+          content = {
+            format = "xfs";
+            mountOptions = [ "noatime" ];
+            mountpoint = "/";
+            type = "filesystem";
           };
 
-          type = "gpt";
+          size = "100%";
         };
 
-        level = 1;
-        type = "mdadm";
+        type = "gpt";
       };
-    };
 
+      level = 1;
+      type = "mdadm";
+    };
   };
 }