diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-09 18:45:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-09 18:45:45 +0200 |
| commit | 5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5 (patch) | |
| tree | 1a8818d1ebbb77350c0b5192bf6763d4ffd83d0b /modules/services/x11/xserver.nix | |
| parent | 3b3dc83902a0d1c7735f112a8bd97bd5adaf8efb (diff) | |
| download | nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar.gz nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar.bz2 nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar.lz nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar.xz nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.tar.zst nixlib-5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5.zip | |
Don't load nouveau and nvidiafb when using the proprietary nvidia driver
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 8378e10cc46b..40da6a743891 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -406,24 +406,27 @@ in optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; + boot.blacklistedKernelModules = + optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ]; + environment.etc = - (optionals cfg.exportConfiguration - [ { source = "${configFile}"; - target = "X11/xorg.conf"; - } - # -xkbdir command line option does not seems to be passed to xkbcomp. - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - } - ]) - ++ (optionals (elem "ati_unfree" driverNames) [ - - # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your - # life harder ;) Still it seems to be required - { source = "${kernelPackages.ati_drivers_x11}/etc/ati"; - target = "ati"; - } - ]); + (optionals cfg.exportConfiguration + [ { source = "${configFile}"; + target = "X11/xorg.conf"; + } + # -xkbdir command line option does not seems to be passed to xkbcomp. + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + } + ]) + ++ (optionals (elem "ati_unfree" driverNames) [ + + # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your + # life harder ;) Still it seems to be required + { source = "${kernelPackages.ati_drivers_x11}/etc/ati"; + target = "ati"; + } + ]); environment.x11Packages = [ xorg.xorgserver |