update disks for warsaw

nixos/hosts/warsaw-ovh-01/disks.nix

@@ -1,5 +1,4 @@
 {
-  # https://github.com/nix-community/disko/blob/master/example/boot-raid1.nix
   imports = [ ../../common/services/snapper.nix ];
 
   # extra configs not present in the standard config above
@@ -12,85 +11,26 @@
   services.btrfs.autoScrub.enable = true;
   services.btrfs.autoScrub.interval = "weekly";
 
-  disko.devices = {
+  disko.devices.disk.sda = {
-    disk = {
-      sda = {
     type = "disk";
     device = "/dev/sda";
     content = { 
       type = "gpt";
       partitions = { 
         BOOT = {
-              size = "1M"; 
+          priority = 1;
-              type = "EF02"; # GRUB MBR
+          name = "BOOT";
-            };
+          start = "0%";
-            ESP = {
+          end = "550MiB";
-              size = "500M";
           type = "EF00";
-              content = {
-                type = "mdraid";
-                name = "boot";
-              };
-            };
-            mdadm = {
-              size = "100%";
-              content = {
-                type = "mdraid";
-                name = "raid1";
-              };
-            };
-          };
-        };
-      };
-
-      sdb = {
-        type = "disk"; 
-        device = "/dev/sdb";
-        content = {
-          type = "gpt";
-          partitions = {
-            BOOT = {
-              size = "1M"; 
-              type = "EF02"; # GRUB MBR
-            };
-            ESP = {
-              size = "500M";
-              type = "EF00";
-              content = {
-                type = "mdraid";
-                name = "boot";
-              };
-            };
-            mdadm = {
-              size = "100%";
-              content = {
-                type = "mdraid";
-                name = "raid1";
-              };
-            };
-          };
-        };
-      };
-    };
-
-    mdadm = {
-      boot = {
-        type = "mdadm";
-        level = 1;
-        metadata = "1.0";
           content = {
             type = "filesystem";
             format = "vfat";
-          mountpoint = "/boot";
+            # https://github.com/nix-community/disko/issues/527 
             mountOptions = [ "umask=0077" ];
+            mountpoint = "/boot";
           };
-      };
+        }; # partition 1 (ESP)
-      raid1 = {
-        type = "mdadm";
-        level = 1;
-        content = {
-          type = "gpt";
-          partitions = {
         LUKS-ROOT = { 
           start = "550MiB";
           end = "100%";
@@ -114,10 +54,6 @@
                   mountpoint = "/nix";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
-                    "/Storage" = {
-                      mountpoint = "/Storage";
-                      mountOptions = [ "compress=zstd" "noatime" ];
-                    }; # Storage
                 # SNAPSHOT SUBVOLS
                 "/root/.snapshots" = {
                   mountpoint = "/.snapshots";
@@ -131,6 +67,35 @@
                   mountpoint = "/nix/.snapshots";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
+              }; # subvolumes
+            }; # content.content
+          }; # content
+        }; # partition 2 (/ BTRFS)
+      }; # partitions
+    }; # content
+  }; # disko.devices.disk.sda
+  
+  disko.devices.disk.sdb = {
+    type = "disk";
+    device = "/dev/sdb";
+    content = { 
+      type = "gpt";
+      partitions = { 
+        LUKS-STORAGE = { 
+          start = "550MiB";
+          end = "100%";
+          content = {
+            type = "luks";
+            name = "STORAGE";
+            extraOpenArgs = [ "--allow-discards" ];
+            content = {
+              type = "btrfs";
+              extraArgs = [ "-f" ];
+              subvolumes = {
+                "/Storage" = {
+                  mountpoint = "/Storage";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # Storage
                 "/Storage/.snapshots" = {
                   mountpoint = "/Storage/.snapshots";
                   mountOptions = [ "compress=zstd" "noatime" ];
@@ -139,9 +104,7 @@
             }; # content.content
           }; # content
         }; # partition 2 (/ BTRFS)
-          };
+      }; # partitions
-        };
+    }; # content
-      };
+  }; # disko.devices.disk.sdb
-    };
+} # root
-  };  
-}