Add disko

flake.lock

@@ -142,6 +142,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1677116397,
+        "narHash": "sha256-2OHwhv4k1SDEuNxhq+zluvrd5pbW8d4TP9NKW4B8iO8=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "8fddb2fd721365fa77ff68b709539639d4dc65d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "dzgui": {
       "inputs": {
         "dzgui": "dzgui_2",
@@ -465,11 +485,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1677153098,
+        "lastModified": 1677192448,
-        "narHash": "sha256-C5NsaJKeNe+Aa1REK6Ae1ywiybkKbtX92FP6OYZA0Lc=",
+        "narHash": "sha256-bqHXpEDxPnDF4tdBld2fL13ZtWNGsv/EINENxS+T1UM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "12e6af8be38edb8358041e0ff3796919917c0d7b",
+        "rev": "81cee6fd1d178fca9ad861247cc9b15cd114f203",
         "type": "github"
       },
       "original": {
@@ -533,6 +553,7 @@
         "alacritty-sixel": "alacritty-sixel",
         "demoji": "demoji",
         "dhist": "dhist",
+        "disko": "disko",
         "dzgui": "dzgui",
         "home-manager": "home-manager",
         "hyprland": "hyprland",

flake.nix

@@ -51,8 +51,8 @@
     dzgui.url = "github:lelgenio/dzgui-nix";
     dzgui.inputs.nixpkgs.follows = "nixpkgs";
 
-    inputs.disko.url = "github:nix-community/disko";
+    disko.url = "github:nix-community/disko";
-    inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
 
     # my stuff
     dhist = {
@@ -108,15 +108,18 @@
       ++ lib.optional (desktop == "kde") ./system/kde.nix;
     in
     {
+      checks."${system}" = {
+        disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
+      };
       nixosConfigurations = {
         i15 = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/i15.nix ] ++ common_modules;
+          modules = [ ./hosts/i15 ] ++ common_modules;
         };
         monolith = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
-            ./hosts/monolith.nix
+            ./hosts/monolith
             ./system/monolith-gitlab-runner.nix
             ./system/nix-serve.nix
             ./system/steam.nix
@@ -125,13 +128,13 @@
         rainbow = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
-            ./hosts/rainbow.nix
+            ./hosts/rainbow
             ./system/rainbow-gitlab-runner.nix
           ] ++ common_modules;
         };
         pixie = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{
+          modules = [ ./hosts/pixie ] ++ common_modules ++ [{
             packages.media-packages.enable = lib.mkOverride 0 false;
             programs.steam.enable = lib.mkOverride 0 false;
             services.flatpak.enable = lib.mkOverride 0 false;

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";
+          name = "CRYPT_I15";
-          start = "1GiB";
+          start = "300MiB";
           end = "100%";
           content = {
             type = "luks";
             name = "main";
+            keyFile = "/tmp/secret.key";
             content = {
               type = "btrfs";
-              name = "BTRFS_ROOT";
+              extraArgs = [ "--label" "ROOT_I15" ];
-              mountpoint = "/";
+              subvolumes = let mountOptions = btrfs_options; in {
-              subvolumes = [ "/home" "/nixos" "/swap" ];
+                "/home" = { inherit mountOptions; };
+                "/nixos" = {
+                  inherit mountOptions;
+                  mountpoint = "/";
+                };
+                "/swap" = { inherit mountOptions; };
+              };
             };
           };
         }

overlays/default.nix

@@ -79,5 +79,14 @@
 
   variables = (final: prev: {
     uservars = import ../user/variables.nix;
+
+    makeDiskoTest =
+      let
+        makeTest = import (prev.path + "/nixos/tests/make-test-python.nix");
+        eval-config = import (prev.path + "/nixos/lib/eval-config.nix");
+      in
+      (prev.callPackage "${inputs.disko}/tests/lib.nix" {
+        inherit makeTest eval-config;
+      }).makeDiskoTest;
   });
 }