Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv wu: move video driver stuff to w110er

Browse Source
This commit is contained in:
tv 2018-01-04 02:28:44 +01:00
parent 593ca08de1
commit 5dc8b8b3f3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tv/1systems/wu/config.nix
View File

@ -44,12 +44,6 @@ with import <stockholm/lib>;
}; };
}; };
krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
hardware.bumblebee.enable = true;
hardware.bumblebee.group = "video";
hardware.enableRedistributableFirmware= true;
hardware.opengl.driSupport32Bit = true;
services.printing.enable = true; services.printing.enable = true;
services.udev.extraRules = '' services.udev.extraRules = ''

17
tv/2configs/hw/w110er.nix
View File

@ -1,8 +1,20 @@
with import <stockholm/lib>;
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
../smartd.nix ../smartd.nix
{
# nvidia doesn't build despite
# https://github.com/NixOS/nixpkgs/issues/33284
#hardware.bumblebee.enable = true;
#hardware.bumblebee.group = "video";
#hardware.enableRedistributableFirmware= true;
#krebs.nixpkgs.allowUnfreePredicate = pkg:
# hasPrefix "nvidia-x11-" pkg.name ||
# hasPrefix "nvidia-persistenced-" pkg.name ||
# hasPrefix "nvidia-settings-" pkg.name;
}
]; ];
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
@ -15,6 +27,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
networking.wireless.enable = true; networking.wireless.enable = true;
@ -41,4 +54,8 @@
echo auto > $i/power/control # defaults to 'on' echo auto > $i/power/control # defaults to 'on'
done) done)
''; '';
services.xserver = {
videoDriver = "intel";
};
} }