From c8884e45091ea69e30bed861098dcbd1b434db15 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Sun, 27 Mar 2022 22:27:06 -0400 Subject: [PATCH] optimize hardware module --- flake.nix | 2 +- lib/hardware.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 019369c..5196e6f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ hardware = nixos-hardware.nixosModules // - import lib/hardware.nix "${nixpkgs}/nixos/modules"; + import lib/hardware.nix; forAllSystems = f: nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] diff --git a/lib/hardware.nix b/lib/hardware.nix index 0d88fbf..0ba976a 100644 --- a/lib/hardware.nix +++ b/lib/hardware.nix @@ -1,12 +1,12 @@ -modulesPath: { +{ physical = { lib, ... }: lib.mkMerge [ - (import "${modulesPath}/installer/scan/not-detected.nix" { inherit lib; }) { hardware.cpu.amd.updateMicrocode = true; } { hardware.cpu.intel.updateMicrocode = true; } + { hardware.enableRedistributableFirmware = true; } ]; - qemu = { lib, ... }: lib.mkMerge + qemu = { lib, modulesPath, ... }: lib.mkMerge [ (import "${modulesPath}/profiles/qemu-guest.nix" { }) { services.qemuGuest.enable = true; }