From c16f93fb5191de796835b3c1b5ae810ecf93a414 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 22 Apr 2020 13:35:35 +0200
Subject: nvidia-gpu: ensure nouveau module is not loaded

---
 system/settings/hardware/nvidia-gpu.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'system/settings/hardware/nvidia-gpu.nix')

diff --git a/system/settings/hardware/nvidia-gpu.nix b/system/settings/hardware/nvidia-gpu.nix
index 0f99e73c..c6662659 100644
--- a/system/settings/hardware/nvidia-gpu.nix
+++ b/system/settings/hardware/nvidia-gpu.nix
@@ -1,6 +1,15 @@
 { config, pkgs, ... }:
 
-{ services.xserver.videoDrivers = [ "nvidia" ];
+let
+  nvidia_x11 = config.boot.kernelPackages.nvidia_x11;
+in { services.xserver.videoDrivers = [ "nvidia" ];
+  boot = {
+    blacklistedKernelModules = [ "nouveau" ];
+    extraModulePackages = [ nvidia_x11 ];
+  };
+
+  environment.systemPackages = [ nvidia_x11 ];
+
   nixpkgs.config.allowUnfree = true;
   services.compton = {
     enable = true;
-- 
cgit 1.4.1