From 94322b6492f8bc665ccfd93d532945dedda830b9 Mon Sep 17 00:00:00 2001
From: Joey Hafner <joey@jafner.net>
Date: Thu, 6 Feb 2025 15:32:26 -0800
Subject: [PATCH] Enhancement: Consolidate hardware/boot config.

---
 dotfiles/systems/fighter/boot.nix          | 15 ---------------
 dotfiles/systems/fighter/configuration.nix |  1 -
 dotfiles/systems/fighter/hardware.nix      | 19 +++++++++++++++----
 3 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 dotfiles/systems/fighter/boot.nix

diff --git a/dotfiles/systems/fighter/boot.nix b/dotfiles/systems/fighter/boot.nix
deleted file mode 100644
index a4fdb880..00000000
--- a/dotfiles/systems/fighter/boot.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }: {
-  fileSystems = {
-    "/" = { 
-      device = "/dev/disk/by-uuid/88a3f223-ed42-4be1-a748-bb9e0f9007dc";
-      fsType = "ext4";
-    };
-
-    "/boot" = { 
-      device = "/dev/disk/by-uuid/744D-0867";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-  };
-  boot.loader.systemd-boot.enable = true;
-}
\ No newline at end of file
diff --git a/dotfiles/systems/fighter/configuration.nix b/dotfiles/systems/fighter/configuration.nix
index 1d1cd8c7..e84699bc 100644
--- a/dotfiles/systems/fighter/configuration.nix
+++ b/dotfiles/systems/fighter/configuration.nix
@@ -1,6 +1,5 @@
 { sys, ... }: {
   imports = [
-    ./boot.nix
     ./docker.nix
     ./hardware.nix
     ./network-shares.nix
diff --git a/dotfiles/systems/fighter/hardware.nix b/dotfiles/systems/fighter/hardware.nix
index b15eec03..03e887de 100644
--- a/dotfiles/systems/fighter/hardware.nix
+++ b/dotfiles/systems/fighter/hardware.nix
@@ -2,17 +2,28 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { ... }: {
+  fileSystems = {
+    "/" = { 
+      device = "/dev/disk/by-uuid/88a3f223-ed42-4be1-a748-bb9e0f9007dc";
+      fsType = "ext4";
+    };
+
+    "/boot" = { 
+      device = "/dev/disk/by-uuid/744D-0867";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+  };
+  swapDevices = [ { device = "/.swapfile"; size = 32*1024;} ];
+
   boot = { 
+    loader.systemd-boot.enable = true;
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
     initrd.kernelModules = [ ];
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
   };
 
-  swapDevices = [
-    { device = "/.swapfile"; size = 32*1024;}
-  ];
-
   nixpkgs.hostPlatform = "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;