skipper: refactor hardware module

hosts/skipper/hardware/default.nix

@@ -2,27 +2,29 @@
 , pkgs
 , ...
 }: {
-  imports = [ ./kernel.nix ./filesystem.nix ];
+  imports = [ ./filesystem.nix ];
 
   boot = {
-    initrd = {
+    consoleLogLevel = 3;
-      luks.devices = {
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
-        luks0 = {
+    kernelParams = [ "quiet" ];
-          allowDiscards = true;
+    kernelModules = [ "kvm-intel" ];
-          bypassWorkqueues = true;
+    kernel.sysctl = {
-          device = "/dev/disk/by-partlabel/CRYPT";
+      "vm.swappiness" = 10;
-          preLVM = true;
+      "vm.dirty_ratio" = 3;
-        };
+    };
-      };
+    initrd = {
-      supportedFilesystems = [ "vfat" "btrfs" ];
+      availableKernelModules = [
+        "xhci_pci"
+        "thunderbolt"
+        "nvme"
+        "rtsx_pci_sdmmc"
+      ];
+      kernelModules = [ "i915" "dm-snapshot" ];
+      systemd.enable = true;
     };
-    loader.efi.canTouchEfiVariables = true;
-    resumeDevice = "/dev/vg0/swap";
-    supportedFilesystems = [ "vfat" "ntfs" "exfat" "ext4" "btrfs" ];
   };
 
-  swapDevices = [{ device = "/dev/vg0/swap"; }];
-
   hardware = {
     bluetooth = {
       enable = true;
@@ -50,4 +52,5 @@
     steam-hardware.enable = true;
     xone.enable = true;
   };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

hosts/skipper/hardware/filesystem.nix

@@ -1,4 +1,19 @@
 _: {
+  boot = {
+    initrd = {
+      supportedFilesystems = [ "vfat" "btrfs" ];
+      luks.devices = {
+        luks0 = {
+          allowDiscards = true;
+          bypassWorkqueues = true;
+          device = "/dev/disk/by-partlabel/CRYPT";
+          preLVM = true;
+        };
+      };
+    };
+    supportedFilesystems = [ "vfat" "ntfs" "exfat" "ext4" "btrfs" ];
+    resumeDevice = "/dev/vg0/swap";
+  };
   fileSystems = {
     "/" = {
       device = "/dev/vg0/system";
@@ -33,4 +48,6 @@ _: {
       fsType = "vfat";
     };
   };
+
+  swapDevices = [{ device = "/dev/vg0/swap"; }];
 }

hosts/skipper/hardware/kernel.nix

@@ -1,26 +0,0 @@
-{ lib
-, pkgs
-, ...
-}: {
-  boot = {
-    consoleLogLevel = 3;
-    initrd = {
-      availableKernelModules = [
-        "xhci_pci"
-        "thunderbolt"
-        "nvme"
-        "rtsx_pci_sdmmc"
-      ];
-      kernelModules = [ "i915" "dm-snapshot" ];
-      systemd.enable = true;
-    };
-    kernelModules = [ "kvm-intel" ];
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
-    kernelParams = [ "quiet" ];
-    kernel.sysctl = {
-      "vm.swappiness" = 10;
-      "vm.dirty_ratio" = 3;
-    };
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}

hosts/skipper/secureboot.nix

@@ -8,7 +8,10 @@
   };
   boot = {
     bootspec.enable = true;
-    loader.systemd-boot.enable = lib.mkForce false;
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot.enable = lib.mkForce false;
+    };
     lanzaboote = {
       enable = true;
       pkiBundle = "/persist/secrets/secureboot";