From e34d5d003fb02da1be74f08555120feffbf24605 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Thu, 11 Jan 2024 12:58:58 +0100
Subject: [PATCH] feat(dgn-hardware): Move specific configurations back to the
 servers

---
 machines/compute01/_hardware-configuration.nix | 13 +++++++++++++
 machines/storage01/_hardware-configuration.nix | 13 +++++++++++++
 modules/dgn-hardware.nix                       | 10 ----------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/machines/compute01/_hardware-configuration.nix b/machines/compute01/_hardware-configuration.nix
index 629c599..7f75d72 100644
--- a/machines/compute01/_hardware-configuration.nix
+++ b/machines/compute01/_hardware-configuration.nix
@@ -6,6 +6,19 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
+  boot = {
+    initrd.availableKernelModules = [
+      "ahci"
+      "ehci_pci"
+      "megaraid_sas"
+      "usb_storage"
+      "usbhid"
+      "sd_mod"
+      "sr_mod"
+    ];
+    kernelModules = [ "kvm-intel" ];
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/c83f6978-fd26-44a8-a86a-b0e971bb0c8c";
     fsType = "ext4";
diff --git a/machines/storage01/_hardware-configuration.nix b/machines/storage01/_hardware-configuration.nix
index 2272703..ac55ed7 100644
--- a/machines/storage01/_hardware-configuration.nix
+++ b/machines/storage01/_hardware-configuration.nix
@@ -6,6 +6,19 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
+  boot = {
+    initrd.availableKernelModules = [
+      "ahci"
+      "ehci_pci"
+      "megaraid_sas"
+      "usb_storage"
+      "usbhid"
+      "sd_mod"
+      "sr_mod"
+    ];
+    kernelModules = [ "kvm-intel" ];
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/278cb2a2-47b9-4ec5-8b68-a5a6d037d59e";
     fsType = "ext4";
diff --git a/modules/dgn-hardware.nix b/modules/dgn-hardware.nix
index 04495a9..bac774d 100644
--- a/modules/dgn-hardware.nix
+++ b/modules/dgn-hardware.nix
@@ -50,16 +50,6 @@ in {
 
     (mkIf cfg.useZfs {
       boot = {
-        initrd.availableKernelModules = [
-          "ahci"
-          "ehci_pci"
-          "megaraid_sas"
-          "usb_storage"
-          "usbhid"
-          "sd_mod"
-          "sr_mod"
-        ];
-        kernelModules = [ "kvm-intel" ];
         supportedFilesystems = [ "zfs" ];
 
         zfs = {