From d9635231bf8aa015d330f84b6f8ecc711c7d69f0 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sat, 14 Dec 2024 18:00:26 -0500
Subject: [PATCH] Systems: load initrd kernel modules

---
 .../Hevana/hardware-configuration.nix         |  2 +-
 .../Khanda/hardware-configuration.nix         | 40 +++++++++----------
 .../Shura/hardware-configuration.nix          |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/systems/x86_64-linux/Hevana/hardware-configuration.nix b/systems/x86_64-linux/Hevana/hardware-configuration.nix
index 48c4414..48f9011 100644
--- a/systems/x86_64-linux/Hevana/hardware-configuration.nix
+++ b/systems/x86_64-linux/Hevana/hardware-configuration.nix
@@ -10,7 +10,7 @@ in
   boot = {
     kernelModules = [ "kvm-amd" ];
 
-    initrd.availableKernelModules = [
+    initrd.kernelModules = [
       "kvm-amd"
       "nvme"
       "xhci_pci"
diff --git a/systems/x86_64-linux/Khanda/hardware-configuration.nix b/systems/x86_64-linux/Khanda/hardware-configuration.nix
index 0e72d8a..5e0d3ce 100644
--- a/systems/x86_64-linux/Khanda/hardware-configuration.nix
+++ b/systems/x86_64-linux/Khanda/hardware-configuration.nix
@@ -31,27 +31,25 @@ in
       options iwlwifi 11n_disable=8
     '';
 
-    initrd = {
-      availableKernelModules = [
-        "kvm-intel"
-        "surface_aggregator"
-        "surface_aggregator_registry"
-        "surface_aggregator_hub"
-        "surface_hid_core"
-        "surface_hid"
-        "hid_multitouch"
-        "8250_dw"
-        "intel_lpss"
-        "intel_lpss_pci"
-        "xhci_pci"
-        "thunderbolt"
-        "nvme"
-        "usb_storage"
-        "sd_mod"
-        "surface_kbd"
-        "pinctrl_tigerlake"
-      ];
-    };
+    initrd.kernelModules = [
+      "kvm-intel"
+      "surface_aggregator"
+      "surface_aggregator_registry"
+      "surface_aggregator_hub"
+      "surface_hid_core"
+      "surface_hid"
+      "hid_multitouch"
+      "8250_dw"
+      "intel_lpss"
+      "intel_lpss_pci"
+      "xhci_pci"
+      "thunderbolt"
+      "nvme"
+      "usb_storage"
+      "sd_mod"
+      "surface_kbd"
+      "pinctrl_tigerlake"
+    ];
 
     kernelParams = [
       "pci=hpiosize=0" # Prevent ACPI interrupt storm. See https://github.com/linux-surface/linux-surface/wiki/Surface-Pro-9#acpi-interrupt-storm
diff --git a/systems/x86_64-linux/Shura/hardware-configuration.nix b/systems/x86_64-linux/Shura/hardware-configuration.nix
index 3899136..f30ea3c 100644
--- a/systems/x86_64-linux/Shura/hardware-configuration.nix
+++ b/systems/x86_64-linux/Shura/hardware-configuration.nix
@@ -18,7 +18,7 @@ in
     kernelModules = [ "kvm-amd" ];
 
     # Hardware defaults detected by nixos-generate-configuration
-    initrd.availableKernelModules = [
+    initrd.kernelModules = [
       "kvm-amd"
       "nvme"
       "xhci_pci"