From 0fae0e72d38c1049dcc65875587fb1cf0f012871 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Mon, 3 Nov 2025 22:48:41 -0600
Subject: [PATCH] hardware config removal test

---
 hosts/nixos/yveltal/configuration.nix         | 33 +++++++++++++++----
 .../nixos/yveltal/hardware-configuration.nix  |  7 ----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/hosts/nixos/yveltal/configuration.nix b/hosts/nixos/yveltal/configuration.nix
index ffae220..fc43eec 100644
--- a/hosts/nixos/yveltal/configuration.nix
+++ b/hosts/nixos/yveltal/configuration.nix
@@ -1,9 +1,10 @@
-{ config, lib, inputs, stable_pkgs, unstable_pkgs, ... }:
+{ config, lib, modulesPath, inputs, stable_pkgs, unstable_pkgs, ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+      (modulesPath + "/installer/scan/not-detected.nix")
+      #./hardware-configuration.nix
       ../../nixos
       ../../../modules/desktop/hypr
       ../../../modules/desktop/greetd
@@ -30,10 +31,20 @@
     #HibernateDelaySec = "30min";
   };
 
-  # boot (systemd is going on me)
-  boot.loader.systemd-boot.enable = true;   # systemd your pretty cool ya know
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.initrd.systemd.enable = true;  # better logging
+  # boot (systemd is growing on me)
+  boot = {
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+    loader = {
+      systemd-boot.enable = true;   # systemd your pretty cool ya know
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      systemd.enable = true;  # better logging
+      availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
+      kernelModules = [ ];
+    }; 
+  };
 
   # setup hostname and networking stack
   services.resolved = {
@@ -43,6 +54,10 @@
   };
   networking = {
     hostName = "yveltal"; # hostname
+    useDHCP = lib.mkDefault true;
+    interfaces = {
+      wlp0s20f3.useDHCP = lib.mkDefault true;
+    };
     networkmanager = {
       enable = true;  # the goat
       dns = "systemd-resolved"; # the backup dancer!
@@ -62,5 +77,11 @@
 
   system.stateVersion = "25.05"; # stays here :   )
 
+
+  # hardware shit
+
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
 
diff --git a/hosts/nixos/yveltal/hardware-configuration.nix b/hosts/nixos/yveltal/hardware-configuration.nix
index abb5fb2..20445c9 100644
--- a/hosts/nixos/yveltal/hardware-configuration.nix
+++ b/hosts/nixos/yveltal/hardware-configuration.nix
@@ -8,10 +8,6 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
 
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -19,8 +15,5 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }