diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-10-31 10:28:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 10:28:40 +0000 |
| commit | 99cdc883064ac5a1b9e189d3500a809616e79765 (patch) | |
| tree | e70106013be2cdbc6a61e7ade4cba731b8fcd53b | |
| parent | 5c8cab8493461a599d907900b5d192fe2541d799 (diff) | |
| parent | 1d254aceda0ba852c83aa7dcbfd215e1f70ada35 (diff) | |
| download | nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar.gz nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar.bz2 nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar.lz nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar.xz nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.tar.zst nixlib-99cdc883064ac5a1b9e189d3500a809616e79765.zip | |
Merge pull request #85 from NixOS/201810/microcode
common/cpu: default microcode updates to enableRedistributableFirmware
| -rw-r--r-- | common/cpu/amd/default.nix | 5 | ||||
| -rw-r--r-- | common/cpu/intel/default.nix | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/common/cpu/amd/default.nix b/common/cpu/amd/default.nix index a8a36b2c91ba..d8c48a263081 100644 --- a/common/cpu/amd/default.nix +++ b/common/cpu/amd/default.nix @@ -1,3 +1,6 @@ +{ config, lib, ... }: + { - hardware.cpu.amd.updateMicrocode = true; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index 05b8c0275224..7f2223c72e40 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -1,9 +1,10 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { boot.initrd.kernelModules = [ "i915" ]; - hardware.cpu.intel.updateMicrocode = lib.mkDefault true; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.opengl.extraPackages = with pkgs; [ vaapiIntel |