treewide: dedup disko configuration

nixos/hosts/flandre-m5p/disko-fs.nix

@@ -1,76 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=8G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            cryptroot = {
-              label = "CRYPTROOT";
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "cryptroot";
-                settings = {
-                  allowDiscards = true;
-                  bypassWorkqueues = true;
-                  crypttabExtraOpts = [
-                    "same-cpu-crypt"
-                    "submit-from-crypt-cpus"
-                  ];
-                  # unattended boot via usb
-                  keyFile = "/dev/disk/by-id/usb-aigo_U330_80101016-0:0";
-                  keyFileSize = 512 * 64;
-                };
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ];
-                  subvolumes = {
-                    "/persist" = {
-                      mountpoint = "/persist";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                    "/nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/flandre-m5p/hardware-configuration.nix

@@ -1,13 +1,29 @@
-{ ... }:
+{ profiles, ... }:
 {
+  imports = with profiles; [
+    system.disko.luks-btrfs-common
+  ];
+
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=16G" ];
+    disk.main.device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
+  };
+
   boot = {
-    initrd.availableKernelModules = [
+    initrd = {
-      "xhci_pci"
+      availableKernelModules = [
-      "ahci"
+        "xhci_pci"
-      "usbhid"
+        "ahci"
-      "usb_storage"
+        "usbhid"
-      "sd_mod"
+        "usb_storage"
-    ];
+        "sd_mod"
+      ];
+      # workaround for https://github.com/nix-community/disko/issues/678
+      luks.devices.cryptroot = {
+        keyFile = "/dev/disk/by-id/usb-aigo_U330_80101016-0:0";
+        keyFileSize = 512 * 64;
+      };
+    };
     kernelModules = [ "kvm-amd" ];
     loader = {
       efi.canTouchEfiVariables = false;

nixos/hosts/kanako-hkg0/disko-fs.nix

@@ -1,60 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=2G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              type = "EF02";
-              label = "BOOT";
-              start = "0";
-              end = "+1M";
-            };
-            root = {
-              label = "ROOT";
-              end = "-0";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "boot" = {
-                    mountpoint = "/boot";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/kanako-hkg0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-bios-compat
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=2G" ];
+    disk.main.device = "/dev/vda";
+  };
+
   boot.initrd.availableKernelModules = [
     "ahci"
     "xhci_pci"

nixos/hosts/marisa-7d76/disko-fs.nix

@@ -1,73 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=8G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            cryptroot = {
-              label = "CRYPTROOT";
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "cryptroot";
-                settings = {
-                  allowDiscards = true;
-                  bypassWorkqueues = true;
-                  crypttabExtraOpts = [
-                    "same-cpu-crypt"
-                    "submit-from-crypt-cpus"
-                  ];
-                };
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ];
-                  subvolumes = {
-                    "/persist" = {
-                      mountpoint = "/persist";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                    "/nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/marisa-7d76/hardware-configuration.nix

@@ -1,5 +1,14 @@
-{ lib, ... }:
+{ profiles, lib, ... }:
 {
+  imports = with profiles; [
+    system.disko.luks-btrfs-common
+  ];
+
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=8G" ];
+    disk.main.device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
+  };
+
   boot = {
     initrd.availableKernelModules = [
       "nvme"

nixos/hosts/marisa-a7s/disko-fs.nix

@@ -1,73 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=8G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            cryptroot = {
-              label = "CRYPTROOT";
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "cryptroot";
-                settings = {
-                  allowDiscards = true;
-                  bypassWorkqueues = true;
-                  crypttabExtraOpts = [
-                    "same-cpu-crypt"
-                    "submit-from-crypt-cpus"
-                  ];
-                };
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ];
-                  subvolumes = {
-                    "/persist" = {
-                      mountpoint = "/persist";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                    "/nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/marisa-a7s/hardware-configuration.nix

@@ -1,5 +1,14 @@
-{ lib, ... }:
+{ profiles, lib, ... }:
 {
+  imports = with profiles; [
+    system.disko.luks-btrfs-common
+  ];
+
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=8G" ];
+    disk.main.device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
+  };
+
   boot = {
     initrd.availableKernelModules = [
       "nvme"

nixos/hosts/reisen-fra0/disko-fs.nix

@@ -1,61 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=1G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              label = "ROOT";
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "/persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "/nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/reisen-fra0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-common
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=1G" ];
+    disk.main.device = "/dev/vda";
+  };
+
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;

nixos/hosts/reisen-nrt0/disko-fs.nix

@@ -1,61 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=1G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              label = "ROOT";
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "/persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "/nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/reisen-nrt0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-common
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=1G" ];
+    disk.main.device = "/dev/vda";
+  };
+
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;

nixos/hosts/reisen-sea0/disko-fs.nix

@@ -1,61 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=1G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              label = "ROOT";
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "/persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "/nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/reisen-sea0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-common
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=1G" ];
+    disk.main.device = "/dev/vda";
+  };
+
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;

nixos/hosts/reisen-sin0/disko-fs.nix

@@ -1,61 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=1G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            esp = {
-              label = "ESP";
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              label = "ROOT";
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "/persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "/nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/reisen-sin0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-common
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=1G" ];
+    disk.main.device = "/dev/vda";
+  };
+
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;

nixos/hosts/suwako-vie0/disko-fs.nix

@@ -1,60 +1,4 @@
 {
-  disko.devices = {
-    nodev = {
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "size=4G"
-          "mode=755"
-          "nosuid"
-          "nodev"
-        ];
-      };
-    };
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/sda";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              type = "EF02";
-              label = "BOOT";
-              start = "0";
-              end = "+1M";
-            };
-            root = {
-              label = "ROOT";
-              end = "-0";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "boot" = {
-                    mountpoint = "/boot";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                  "persist" = {
-                    mountpoint = "/persist";
-                    mountOptions = [ "compress=zstd" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  fileSystems."/persist".neededForBoot = true;
-
   environment.globalPersistence = {
     enable = true;
     root = "/persist";

nixos/hosts/suwako-vie0/hardware-configuration.nix

@@ -1,9 +1,15 @@
-{ modulesPath, ... }:
+{ modulesPath, profiles, ... }:
 {
-  imports = [
+  imports = with profiles; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    system.disko.btrfs-bios-compat
   ];
 
+  disko.devices = {
+    nodev."/".mountOptions = [ "size=4G" ];
+    disk.main.device = "/dev/sda";
+  };
+
   boot.initrd.availableKernelModules = [
     "ata_piix"
     "uhci_hcd"

nixos/profiles/system/disko/btrfs-bios-compat.nix

@@ -0,0 +1,56 @@
+{ ... }:
+{
+  disko.devices = {
+    nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "defaults"
+          "mode=755"
+          "nosuid"
+          "nodev"
+        ];
+      };
+    };
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              type = "EF02";
+              label = "BOOT";
+              start = "0";
+              end = "+1M";
+            };
+            root = {
+              label = "ROOT";
+              end = "-0";
+              content = {
+                type = "btrfs";
+                extraArgs = [ "-f" ];
+                subvolumes = {
+                  "/boot" = {
+                    mountpoint = "/boot";
+                    mountOptions = [ "compress=zstd" ];
+                  };
+                  "/nix" = {
+                    mountpoint = "/nix";
+                    mountOptions = [ "compress=zstd" ];
+                  };
+                  "/persist" = {
+                    mountpoint = "/persist";
+                    mountOptions = [ "compress=zstd" ];
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+
+  fileSystems."/persist".neededForBoot = true;
+}

nixos/profiles/system/disko/btrfs-common.nix

@@ -0,0 +1,57 @@
+{ ... }:
+{
+  disko.devices = {
+    nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "defaults"
+          "mode=755"
+          "nosuid"
+          "nodev"
+        ];
+      };
+    };
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            esp = {
+              label = "ESP";
+              size = "2G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            root = {
+              label = "ROOT";
+              size = "100%";
+              content = {
+                type = "btrfs";
+                extraArgs = [ "-f" ];
+                subvolumes = {
+                  "/nix" = {
+                    mountpoint = "/nix";
+                    mountOptions = [ "compress=zstd" ];
+                  };
+                  "/persist" = {
+                    mountpoint = "/persist";
+                    mountOptions = [ "compress=zstd" ];
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+
+  fileSystems."/persist".neededForBoot = true;
+}

nixos/profiles/system/disko/luks-btrfs-common.nix

@@ -0,0 +1,69 @@
+{ ... }:
+{
+  disko.devices = {
+    nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "defaults"
+          "mode=755"
+          "nosuid"
+          "nodev"
+        ];
+      };
+    };
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            esp = {
+              label = "ESP";
+              size = "2G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            cryptroot = {
+              label = "CRYPTROOT";
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "cryptroot";
+                settings = {
+                  allowDiscards = true;
+                  bypassWorkqueues = true;
+                  crypttabExtraOpts = [
+                    "same-cpu-crypt"
+                    "submit-from-crypt-cpus"
+                  ];
+                };
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "/nix" = {
+                      mountpoint = "/nix";
+                      mountOptions = [ "compress=zstd" ];
+                    };
+                    "/persist" = {
+                      mountpoint = "/persist";
+                      mountOptions = [ "compress=zstd" ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+
+  fileSystems."/persist".neededForBoot = true;
+}