summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-12 20:11:22 +0200
committerlassulus <lassulus@lassul.us>2017-07-12 20:11:22 +0200
commit7212de210bb7fc751ffade00d6b1b08f195ddf47 (patch)
tree2e7ad9eb5e322265b964f15a32162f90e923cdc4
parent59bf838bf86021f7513e4b58e4f4df5814e29dba (diff)
parenta321efd5aeab77421cf8b016ee48d1df6b9bb583 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/1systems/mu/config.nix2
-rw-r--r--tv/1systems/wu/config.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 239f333b5..4c6d16329 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -64,7 +64,7 @@ with import <stockholm/lib>;
hardware.pulseaudio.enable = true;
- hardware.enableAllFirmware = true;
+ hardware.enableRedistributableFirmware = true;
boot.loader.gummiboot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 5b2542acd..1e28cc78a 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -140,7 +140,7 @@ with import <stockholm/lib>;
krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
hardware.bumblebee.enable = true;
hardware.bumblebee.group = "video";
- hardware.enableAllFirmware = true;
+ hardware.enableRedistributableFirmware= true;
hardware.opengl.driSupport32Bit = true;
environment.systemPackages = with pkgs; [