common/gpu/nvidia*: Migrate to common/gpu/nvidia/* and add non-prime

Fixes #338

common/gpu/nvidia-disable.nix

@@ -1,9 +1,11 @@
-{ lib, pkgs, ... }:
-
 {
-  # This runs only intel/amdgpu igpus and nvidia dgpus do not drain power.
+  imports = [ ./nvidia/disable.nix ];
 
-  ##### disable nvidia, very nice battery life.
+  warnings = [
-  hardware.nvidiaOptimus.disable = lib.mkDefault true;
+    ''
-  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ];
+      DEPRECATED: The <nixos-hardware/common/gpu/nvidia-disable.nix> module has been deprecated.
+
+      Switch to using <nixos-hardware/common/gpu/nvidia/disable.nix> instead.
+    ''
+  ];
 }

common/gpu/nvidia.nix

@@ -1,26 +1,12 @@
-{ lib, pkgs, ... }:
-
-# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU
-# As per https://nixos.wiki/wiki/Nvidia
-let
-  nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
-    export __NV_PRIME_RENDER_OFFLOAD=1
-    export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
-    export __GLX_VENDOR_LIBRARY_NAME=nvidia
-    export __VK_LAYER_NV_optimus=NVIDIA_only
-    exec "$@"
-  '';
-in
 {
-  services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
+  imports = [ ./nvidia/prime.nix ];
-  environment.systemPackages = [ nvidia-offload ];
 
-  hardware.nvidia.prime = {
+  warnings = [
-    offload.enable = lib.mkDefault true;
+    ''
-    # Hardware should specify the bus ID for intel/nvidia devices
+      DEPRECATED: The <nixos-hardware/common/gpu/nvidia.nix> module has been deprecated.
-  };
 
-  hardware.opengl.extraPackages = with pkgs; [
+      Switch to using <nixos-hardware/common/gpu/nvidia/prime.nix> instead if you use prime offloading.
-    vaapiVdpau
+      If you are using this without prime, consider switching to <nixos-hardware/common/gpu/nvidia> instead.
+    ''
   ];
 }

common/gpu/nvidia/default.nix

@@ -0,0 +1,8 @@
+{ lib, pkgs, ... }:
+
+{
+  services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiVdpau
+  ];
+}

common/gpu/nvidia/disable.nix

@@ -0,0 +1,9 @@
+{ lib, pkgs, ... }:
+
+{
+  # This runs only intel/amdgpu igpus and nvidia dgpus do not drain power.
+
+  ##### disable nvidia, very nice battery life.
+  hardware.nvidiaOptimus.disable = lib.mkDefault true;
+  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ];
+}

common/gpu/nvidia/prime.nix

@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+
+# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU
+# As per https://nixos.wiki/wiki/Nvidia
+let
+  nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
+    export __NV_PRIME_RENDER_OFFLOAD=1
+    export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
+    export __GLX_VENDOR_LIBRARY_NAME=nvidia
+    export __VK_LAYER_NV_optimus=NVIDIA_only
+    exec "$@"
+  '';
+in {
+  imports = [ ./. ];
+
+  environment.systemPackages = [ nvidia-offload ];
+
+  hardware.nvidia.prime = {
+    offload.enable = lib.mkDefault true;
+    # Hardware should specify the bus ID for intel/nvidia devices
+  };
+}

flake.nix

@@ -157,8 +157,9 @@
       common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
       common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;
       common-gpu-intel = import ./common/gpu/intel.nix;
-      common-gpu-nvidia = import ./common/gpu/nvidia.nix;
+      common-gpu-nvidia = import ./common/gpu/nvidia/prime.nix;
-      common-gpu-nvidia-disable = import ./common/gpu/nvidia-disable.nix;
+      common-gpu-nvidia-nonprime = import ./common/gpu/nvidia;
+      common-gpu-nvidia-disable = import ./common/gpu/nvidia/disable.nix;
       common-pc = import ./common/pc;
       common-pc-hdd = import ./common/pc/hdd;
       common-pc-laptop = import ./common/pc/laptop;