refactor

devices/default.nix

@@ -5,43 +5,61 @@
   ...
 }:
 with lib;
+with self.lib;
 let
-  device = [
-    "nixos-x86_64-generic-btrfs"
-  ];
+  x86_64-devices = cartesianProduct {
+    name = listNixname "${self}/devices/x86_64-linux";
+    system = [ "x86_64-linux" ];
+  };
+  aarch64-devices = cartesianProduct {
+    name = [ ];
+    system = [ "aarch64-linux" ];
+  };
+  devices = x86_64-devices ++ aarch64-devices;
   diskType = [
     "mmc"
     "sd"
     "usb"
     "nvme"
     "scsi"
   ];
-  imageNames = mapCartesianProduct ({ device, diskType }: "${device}-${diskType}") {
-    inherit device diskType;
-  };
+  images =
+    mapCartesianProduct
+      (
+        { devices, diskType }:
+        {
+          name = "${devices.name}-${diskType}";
+          device = devices.name;
+          inherit diskType;
+          inherit (devices) system;
+        }
+      )
+      {
+        inherit devices diskType;
+      };
 in
 {
-  flake = rec {
-    nixosConfigurations = listToAttrs (
-      mapCartesianProduct (
-        { device, diskType }:
-        (nameValuePair "${device}-${diskType}" (
-          lib.nixosSystem {
-            specialArgs = {
-              inherit inputs self;
-            };
-            modules = [
-              { disko.type = diskType; disko.label = device; }
-              ./${device}.nix
-              self.nixosModules.default
-              inputs.disko.nixosModules.default
-            ];
+  flake = {
+    nixosConfigurations = genAttrs' images (
+      image:
+      (lib.nixosSystem {
+        system = image.system;
+        specialArgs = {
+          inherit inputs self;
+        };
+        modules = [
+          {
+            disko.type = image.diskType;
+            disko.label = image.device;
           }
-        ))
-      ) { inherit device diskType; }
+          ./${image.system}/${image.device}.nix
+          self.nixosModules.default
+          inputs.disko.nixosModules.default
+        ];
+      })
     );
-    images = genAttrs imageNames (
-      imageName: nixosConfigurations.${imageName}.config.system.build.diskoImages
+    images = genAttrs' images (
+      image: self.nixosConfigurations.${image.name}.config.system.build.diskoImages
     );
   };
 }

devices/x86_64-linux/nixos-x86_64-generic-btrfs.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  lib,
+  modulesPath,
+  inputs,
+  self,
+  ...
+}:
+{
+  imports = [
+    ./nixos-x86_64-uefi-btrfs.nix
+  ];
+
+  disko.biosboot.enable = true;
+  boot.loader.grub.device = "/dev/disk/by-diskseq/1";
+}

devices/nixos-x86_64-generic-btrfs.nix → devices/x86_64-linux/nixos-x86_64-uefi-btrfs.nix

@@ -8,13 +8,9 @@
   ...
 }:
 {
-  nixpkgs = {
-    system = "x86_64-linux";
-  };
-
   imports = [
     (modulesPath + "/profiles/all-hardware.nix")
-    self.nixosModules.hybrid-btrfs
+    self.nixosModules.btrfs
   ];
 
   boot = {
@@ -31,7 +27,6 @@
         enable = true;
         efiSupport = true;
         efiInstallAsRemovable = true;
-        device = "/dev/disk/by-diskseq/1";
         extraConfig = ''
           serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
           terminal_input --append serial

flake.nix

@@ -20,6 +20,7 @@
       imports = [
         ./devices
         ./modules
+        ./lib
       ];
       perSystem =
         { config, pkgs, ... }:

lib/default.nix

@@ -0,0 +1,11 @@
+{
+  self,
+  inputs,
+  lib,
+  ...
+}:
+{
+  flake = {
+    lib = import ./lib.nix { inherit self inputs lib; };
+  };
+}

lib/lib.nix

@@ -0,0 +1,15 @@
+{
+  self,
+  inputs,
+  lib,
+  ...
+}:
+with lib;
+rec {
+  genAttrs' = items: v: listToAttrs (map (item: nameValuePair item.name (v item)) items);
+
+  listNixfile =
+    path: with builtins; filter (name: match "(.+)\\.nix" name != null) (attrNames (readDir path));
+
+  listNixname = path: with builtins; map (file: head (match "(.+)\\.nix" file)) (listNixfile path);
+}

modules/all-modules.nix

@@ -1,6 +1,13 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./disko/label.nix
     ./system/grow-partition.nix
   ];
+  system.stateVersion = config.system.nixos.release;
 }

modules/default.nix

@@ -6,7 +6,7 @@
           ./all-modules.nix
         ];
       };
-      hybrid-btrfs = ./disko/hybrid-btrfs.nix;
+      btrfs = ./disko/btrfs.nix;
     };
   };
 }

modules/disko/btrfs.nix

@@ -0,0 +1,98 @@
+{ config, lib, ... }:
+let
+  device = config.boot.loader.grub.device;
+  partitions =
+    if config.disko.biosboot.enable then
+      {
+        boot = {
+          size = "1M";
+          type = "EF02";
+          priority = 0;
+        };
+      }
+    else
+      { };
+in
+{
+  options = {
+    disko.biosboot.enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Whether to enable biosboot part in gptdisk
+      '';
+    };
+  };
+
+  config = {
+    disko = {
+      enableConfig = true;
+      devices = {
+        disk.main = {
+          name = config.disko.type;
+          imageSize = "2G";
+          device = if (device != "") then device else "/dev/disk/by-diskseq/1";
+          type = "disk";
+          content = {
+            type = "gpt";
+            partitions = partitions // {
+              ESP = {
+                name = "ESP";
+                size = "4M";
+                type = "EF00";
+                priority = 1;
+                content = {
+                  type = "filesystem";
+                  format = "vfat";
+                  mountpoint = "/boot/efi";
+                  mountOptions = [
+                    "fmask=0077"
+                    "dmask=0077"
+                  ];
+                };
+              };
+              nix = {
+                size = "100%";
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "/" = {
+                      mountOptions = [ "noatime" ];
+                      mountpoint = "/.btrfs_root";
+                    };
+                    "/@" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/";
+                    };
+                    "/@var" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/var";
+                    };
+                    "/@home" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/home";
+                    };
+                    "/@swap" = {
+                      mountpoint = "/swap";
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}