From ed16a63e50aea0574575333a9f0697b39c1dd3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Tue, 27 Feb 2024 22:26:53 +0100
Subject: [PATCH] Tidy hardware config

---
 hosts/prismo/hardware-configuration.nix | 20 ++++++++++++--------
 system/services.nix                     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/hosts/prismo/hardware-configuration.nix b/hosts/prismo/hardware-configuration.nix
index 1910b75..fa596b4 100644
--- a/hosts/prismo/hardware-configuration.nix
+++ b/hosts/prismo/hardware-configuration.nix
@@ -6,20 +6,24 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules =
+        [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ ];
+
+      luks.devices."cryptroot".device =
+        "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
     fsType = "xfs";
   };
 
-  boot.initrd.luks.devices."cryptroot".device =
-    "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/AF2D-FAD0";
     fsType = "vfat";
diff --git a/system/services.nix b/system/services.nix
index fbfec73..1632f74 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ pkgs, ... }: {
   services = {
     dbus.enable = true;
     pipewire = {