From e65fbecd3ca83eff010f4d33cf99fe1c5650aacf Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Tue, 22 Jul 2025 14:16:17 +0200
Subject: [PATCH] System: Reformat hardware-configurations

---
 system/nixinator/hardware-configuration.nix | 20 +++++++++++++++-----
 system/nixtop/hardware-configuration.nix    | 13 ++++++++++++-
 system/servenix/hardware-configuration.nix  |  9 ++++++++-
 system/thinknix/hardware-configuration.nix  |  8 +++++++-
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix
index 4958930e..abacc481 100644
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@@ -12,12 +12,22 @@
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
   boot = {
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ahci"
+      "nvme"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
 
-    # Enable early Nvidia kernel modesetting
-    # https://wiki.archlinux.org/title/GDM#GDM_ignores_Wayland_and_uses_X.Org_by_default (not fixed by this)
-    # https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
-    initrd.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; # NVIDIA
+    initrd.kernelModules = [
+      # Enable Nvidia early KMS
+      "nvidia"
+      "nvidia_modeset"
+      "nvidia_uvm"
+      "nvidia_drm"
+    ];
 
     initrd.supportedFilesystems = [
       "ext4"
diff --git a/system/nixtop/hardware-configuration.nix b/system/nixtop/hardware-configuration.nix
index c0834f98..40869943 100644
--- a/system/nixtop/hardware-configuration.nix
+++ b/system/nixtop/hardware-configuration.nix
@@ -13,10 +13,21 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ehci_pci"
+      "ahci"
+      "usb_storage"
+      "sd_mod"
+      "rtsx_pci_sdmmc"
+    ];
+
     initrd.kernelModules = [];
+
     kernelModules = ["kvm-intel"];
+
     extraModulePackages = with config.boot.kernelPackages; [];
+
     # NOTE: Didn't work with Zen, switched to regular kernel instead
     # kernelPatches = [
     #   {
diff --git a/system/servenix/hardware-configuration.nix b/system/servenix/hardware-configuration.nix
index dd1e824d..b697fc7a 100644
--- a/system/servenix/hardware-configuration.nix
+++ b/system/servenix/hardware-configuration.nix
@@ -10,7 +10,14 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
     initrd.kernelModules = [];
     kernelModules = ["kvm-intel"];
     extraModulePackages = [];
diff --git a/system/thinknix/hardware-configuration.nix b/system/thinknix/hardware-configuration.nix
index 2c5e5d6c..00110f56 100644
--- a/system/thinknix/hardware-configuration.nix
+++ b/system/thinknix/hardware-configuration.nix
@@ -10,7 +10,13 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+    ];
     initrd.kernelModules = [];
     kernelModules = [
       "kvm-intel"