From 40895e71c3f7e0f227d8c5a130ea489d191427cb Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 20 Jan 2024 11:30:10 +0800
Subject: [PATCH] hosts/ni: update hardware and networking setup

---
 configs/nixos/ni/hardware-configuration.nix   | 4 ++--
 configs/nixos/ni/modules/networking/setup.nix | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configs/nixos/ni/hardware-configuration.nix b/configs/nixos/ni/hardware-configuration.nix
index 0acd9a99..de5cbc21 100644
--- a/configs/nixos/ni/hardware-configuration.nix
+++ b/configs/nixos/ni/hardware-configuration.nix
@@ -9,7 +9,7 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usb_storage" "uas" "sd_mod" ];
+    [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -22,7 +22,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault true;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   services.btrfs.autoScrub = {
     enable = true;
diff --git a/configs/nixos/ni/modules/networking/setup.nix b/configs/nixos/ni/modules/networking/setup.nix
index 62dce79e..be5800d6 100644
--- a/configs/nixos/ni/modules/networking/setup.nix
+++ b/configs/nixos/ni/modules/networking/setup.nix
@@ -128,10 +128,7 @@ in
 
       # We'll configure individual network interfaces to use DHCP since it can
       # fail wait-online-interface.service.
-      networking.useDHCP = false;
-      networking.dhcpcd.enable = false;
-      networking.interfaces.enp1s0.useDHCP = true;
-      networking.interfaces.wlp2s0.useDHCP = true;
+      networking.useDHCP = lib.mkDefault true;
 
       # Configure the networking bonds.
       networking.bonds.bond0 = {