From 386b3f6616f89583ee89f8a3c9ebc21eed11c457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 3 May 2023 12:10:27 +0200
Subject: [PATCH] feat(hardware): improve firmware config

---
 hardware/base.nix     | 2 +-
 hardware/firmware.nix | 6 ++++++
 hardware/pilot1.nix   | 5 +++--
 home-pc.nix           | 4 ----
 system/desktop.nix    | 2 --
 work-pc.nix           | 2 --
 6 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 hardware/firmware.nix

diff --git a/hardware/base.nix b/hardware/base.nix
index 913e626..900fff8 100644
--- a/hardware/base.nix
+++ b/hardware/base.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./planck.nix ];
+  imports = [ ./firmware.nix ./planck.nix ];
 
   boot.supportedFilesystems = lib.mkDefault [ "btrfs" ];
   boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
diff --git a/hardware/firmware.nix b/hardware/firmware.nix
new file mode 100644
index 0000000..6c6635c
--- /dev/null
+++ b/hardware/firmware.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  hardware.enableAllFirmware = true;
+  services.fwupd.enable = true;
+}
diff --git a/hardware/pilot1.nix b/hardware/pilot1.nix
index 15ae2eb..4dcee40 100644
--- a/hardware/pilot1.nix
+++ b/hardware/pilot1.nix
@@ -20,7 +20,8 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/397a1a92-596f-421b-99e1-c9b2cb821309"; }];
 
-  # TODO keep this disabled?
-  # nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/home-pc.nix b/home-pc.nix
index 8a634a1..d3233de 100644
--- a/home-pc.nix
+++ b/home-pc.nix
@@ -25,10 +25,6 @@
   # cross-compilation support
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
-  hardware.enableAllFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-  services.fwupd.enable = true;
-
   programs.adb.enable = true;
 
   programs.zsh.enable = true;
diff --git a/system/desktop.nix b/system/desktop.nix
index 506ecfc..e6fd5f5 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -3,8 +3,6 @@
 {
   imports = [ ./common.nix ./fonts.nix ./sound.nix ./vpn.nix ];
 
-  services.fwupd.enable = true;
-
   services.printing.enable = true;
   services.avahi.enable = true;
   services.avahi.nssmdns = true;
diff --git a/work-pc.nix b/work-pc.nix
index 9b43540..f2d7c63 100644
--- a/work-pc.nix
+++ b/work-pc.nix
@@ -20,8 +20,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  hardware.enableAllFirmware = true;
-  hardware.cpu.intel.updateMicrocode = true;
   hardware.logitech.wireless.enable = true;
   hardware.logitech.wireless.enableGraphical = true;