From 2fb6a86718e6e77729618f137c66c189641010aa Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sat, 9 Dec 2023 16:09:25 +0800
Subject: [PATCH] nixos: remove hardware.nix

---
 nixos/modules/hardware/components/cpu/intel.nix |  2 +-
 nixos/profiles/core/packages/anti-feature.nix   |  3 +++
 nixos/profiles/core/packages/default.nix        |  3 ---
 nixos/profiles/core/packages/hardware.nix       | 12 ------------
 nixos/profiles/device-type/desktop/default.nix  |  3 +++
 5 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 nixos/profiles/core/packages/hardware.nix

diff --git a/nixos/modules/hardware/components/cpu/intel.nix b/nixos/modules/hardware/components/cpu/intel.nix
index b7ba211..3ab4d1c 100755
--- a/nixos/modules/hardware/components/cpu/intel.nix
+++ b/nixos/modules/hardware/components/cpu/intel.nix
@@ -11,7 +11,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     boot.kernelModules = ["kvm-intel"];
-    hardware.cpu.intel.updateMicrocode = true;
+    hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;
     nixpkgs.hostPlatform = "x86_64-linux";
   };
 }
diff --git a/nixos/profiles/core/packages/anti-feature.nix b/nixos/profiles/core/packages/anti-feature.nix
index 15c95bb..f909b5f 100644
--- a/nixos/profiles/core/packages/anti-feature.nix
+++ b/nixos/profiles/core/packages/anti-feature.nix
@@ -1,4 +1,7 @@
 {lib, ...}: {
+  hardware.enableRedistributableFirmware = true;
+  #hardware.enableAllFirmware = true;
+
   nixpkgs.config = {
     allowBroken = false;
     allowUnsupportedSystem = false;
diff --git a/nixos/profiles/core/packages/default.nix b/nixos/profiles/core/packages/default.nix
index 2e10076..b8922fe 100755
--- a/nixos/profiles/core/packages/default.nix
+++ b/nixos/profiles/core/packages/default.nix
@@ -1,8 +1,5 @@
 {...}: {
   imports = [
-    ./hardware.nix # TODO: move this somewhere else?
-
-    # TODO: should this be considered user-specific?
     ./overlays
     ./anti-feature.nix
   ];
diff --git a/nixos/profiles/core/packages/hardware.nix b/nixos/profiles/core/packages/hardware.nix
deleted file mode 100644
index 59cf49b..0000000
--- a/nixos/profiles/core/packages/hardware.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-_: {
-  hardware = {
-    enableRedistributableFirmware = true;
-    #enableAllFirmware = true;
-  };
-
-  services = {
-    #printing.enable = true; # Printing
-    thermald.enable = true; # Prevents overheating
-    fwupd.enable = true; # Firmware update
-  };
-}
diff --git a/nixos/profiles/device-type/desktop/default.nix b/nixos/profiles/device-type/desktop/default.nix
index e7b36c4..5d697b6 100644
--- a/nixos/profiles/device-type/desktop/default.nix
+++ b/nixos/profiles/device-type/desktop/default.nix
@@ -8,4 +8,7 @@
   networking.stevenblack.enable = true;
   services.system76-scheduler.enable = true;
   services.power-profiles-daemon.enable = true;
+  services.thermald.enable = true;
+  services.fwupd.enable = true;
+  #services.printing.enable = true;
 }