Add disko

hosts/i15.nix

@@ -1,65 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-let
-  btrfs_options = [ "compress=zstd:3" "noatime" ];
-in
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  boot.initrd.luks.devices = {
-    "main" = {
-      bypassWorkqueues = true;
-      device = "/dev/disk/by-label/CRYPT_ROOT";
-    };
-  };
-
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-label/NIX_BOOT";
-    fsType = "vfat";
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@nixos" ] ++ btrfs_options;
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@home" ] ++ btrfs_options;
-  };
-
-  fileSystems."/swap" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@swap" ] ++ btrfs_options;
-  };
-
-  swapDevices = [{
-    device = "/swap/swapfile";
-    size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
-  }];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-  networking.hostName = "i15"; # Define your hostname.
-}

hosts/i15/default.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, modulesPath, ... }: {
+  networking.hostName = "i15"; # Define your hostname.
+
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  swapDevices = [{
+    device = "/swap/swapfile";
+    size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
+  }];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/i15/partitions-test.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+pkgs.makeDiskoTest {
+  name = "test-disko-i15";
+  disko-config = ./partitions.nix;
+  enableOCR = true;
+  bootCommands = ''
+    machine.wait_for_text("[Pp]assphrase for")
+    machine.send_chars("secretsecret\n")
+  '';
+  extraTestScript = ''
+    machine.succeed("cryptsetup isLuks /dev/vda2");
+    machine.succeed("mountpoint /home");
+  '';
+}

hosts/i15/partitions.nix

@@ -1,4 +1,8 @@
-{ disks ? [ "/dev/sda" ], ... }: {
+{ disks ? [ "/dev/sda" ], ... }:
+let
+  btrfs_options = [ "compress=zstd:3" "noatime" ];
+in
+{
   disk.sda = {
     type = "disk";
     device = builtins.elemAt disks 0;
@@ -10,28 +14,36 @@
           type = "partition";
           name = "NIX_BOOT";
           start = "1MiB";
-          end = "1GiB";
+          end = "300MiB";
           bootable = true;
           content = {
             type = "filesystem";
+            extraArgs = [ "-n" "BOOT_I15" ];
             format = "vfat";
             mountpoint = "/boot";
-            options = [ "defaults" ];
+            # options = [ "defaults" ];
           };
         }
         {
           type = "partition";
-          name = "NIX_CRYPT_ROOT";
-          start = "1GiB";
+          name = "CRYPT_I15";
+          start = "300MiB";
           end = "100%";
           content = {
             type = "luks";
             name = "main";
+            keyFile = "/tmp/secret.key";
             content = {
               type = "btrfs";
-              name = "BTRFS_ROOT";
-              mountpoint = "/";
-              subvolumes = [ "/home" "/nixos" "/swap" ];
+              extraArgs = [ "--label" "ROOT_I15" ];
+              subvolumes = let mountOptions = btrfs_options; in {
+                "/home" = { inherit mountOptions; };
+                "/nixos" = {
+                  inherit mountOptions;
+                  mountpoint = "/";
+                };
+                "/swap" = { inherit mountOptions; };
+              };
             };
           };
         }