Test

nixos/hosts/osaka-vultr-01/default.nix

@@ -1,5 +1,7 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
   imports = [ 
+    # This machine won't be using secureboot
+    ../../common/modules/boot.nix
     ./disks.nix
   ];
   nixpkgs.config.allowUnfree = false;

nixos/hosts/osaka-vultr-01/disks.nix

@@ -1,39 +1,57 @@
 {
   boot.loader.grub.device = "/dev/vda";
   boot.initrd.luks.devices."vda2".device = "/dev/vda2";
-  disko.devices = {
+  services.btrfs.autoScrub.enable = true;
-    disk = {
+  services.btrfs.autoScrub.interval = "weekly";
-      vda = {
+
-        type = "disk";
+  disko.devices.disk.vda = {
     device = "/dev/vda";
     content = {
-          type = "gpt";
+      type = "table";
-          partitions = {
+      format = "gpt";
-            ESP = {
+      partitions = [ 
-              size = "100M";
+        {
-              type = "EF00";
+          name = "BOOT";
+          start = "0%";
+          end = "550MiB";
+          bootable = true;
+          flags = [ "esp" ];
+          fs-type = "fat32";
           content = {
             type = "filesystem";
             format = "vfat";
             mountpoint = "/boot";
           };
-            };
+        } # partition 1 (ESP)
-            luks = {
+        {
-              size = "100%";
+          name = "LUKS";
+          start = "550MiB";
+          end = "100%";
           content = {
             type = "luks";
-                name = "crypted";
+            name = "ROOT";
             extraOpenArgs = [ "--allow-discards" ];
             content = {
-                  type = "filesystem";
+              type = "btrfs";
-                  format = "ext4";
+              extraArgs = [ "-f" ];
+              subvolumes = {
+                "/root" = {
                   mountpoint = "/";
-                };
+                  mountOptions = [ "compress=zstd" "noatime" ];
-              };
+                }; # root
-            };
+                "/home" = {
-          };
+                  mountpoint = "/home";
-        };
+                  mountOptions = [ "compress=zstd" "noatime" ];
-      };
+                }; # home
-    };
+                "/nix" = {
-  };
+                  mountpoint = "/nix";
-}
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # nix
+              }; # subvolumes
+            }; # content.content
+          }; # content
+        } # partition 2 (/ BTRFS)
+      ]; # partitions
+    }; # content
+  }; # disko.devices.disk.vda
+} # root