From 325d14280d9195253b1cc572cd893794d57843bf Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 22 Oct 2021 01:48:51 -0400 Subject: [PATCH] move updateMicrocode --- modules/baseline.nix | 5 ----- modules/hardware.nix | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/baseline.nix b/modules/baseline.nix index b8fe0e6..1795eed 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -41,11 +41,6 @@ ''; }; - hardware = { - cpu.amd.updateMicrocode = true; - cpu.intel.updateMicrocode = true; - }; - services.xserver = { libinput.mouse.middleEmulation = false; deviceSection = '' diff --git a/modules/hardware.nix b/modules/hardware.nix index c7223f9..2b3ac22 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -21,7 +21,11 @@ let (hardwareFor "physical" { - inherit (callPackage "${modulesPath}/installer/scan/not-detected.nix" { }) hardware; + hardware.cpu.amd.updateMicrocode = true; + hardware.cpu.intel.updateMicrocode = true; + + # /nixos/modules/installer/scan/not-detected.nix + hardware.enableRedistributableFirmware = true; }) ];