Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2017-07-12 20:11:22 +02:00
commit 7212de210b
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ with import <stockholm/lib>;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
hardware.enableAllFirmware = true; hardware.enableRedistributableFirmware = true;
boot.loader.gummiboot.enable = true; boot.loader.gummiboot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View File

@ -140,7 +140,7 @@ with import <stockholm/lib>;
krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name; krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
hardware.bumblebee.enable = true; hardware.bumblebee.enable = true;
hardware.bumblebee.group = "video"; hardware.bumblebee.group = "video";
hardware.enableAllFirmware = true; hardware.enableRedistributableFirmware= true;
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [