format all

modules/hardware/nvidia.nix

@@ -1,6 +1,15 @@
-{ lib, config, pkgs, inputs, pkgsVersion, ... }:
-let cfg = config.custom.hardware.nvidia;
-in {
+{
+  lib,
+  config,
+  pkgs,
+  inputs,
+  pkgsVersion,
+  ...
+}:
+let
+  cfg = config.custom.hardware.nvidia;
+in
+{
   options.custom.hardware.nvidia = {
     enable = lib.mkEnableOption "Enables nvidia gpus";
     powerLimit = {
@@ -32,51 +41,57 @@ in {
     let
       # the option was renamed in unstable
       nvidiaOption =
-        if (pkgsVersion == inputs.nixpkgs-unstable) then {
-          hardware.graphics = {
-            enable = true;
-            enable32Bit = true;
-            extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+        if (pkgsVersion == inputs.nixpkgs-unstable) then
+          {
+            hardware.graphics = {
+              enable = true;
+              enable32Bit = true;
+              extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+            };
+          }
+        else
+          {
+            hardware.opengl = {
+              enable = true;
+              driSupport = true;
+              driSupport32Bit = true;
+            };
           };
-        } else {
-          hardware.opengl = {
-            enable = true;
-            driSupport = true;
-            driSupport32Bit = true;
-          };
-        };
       nvidia_oc = "${pkgs.nvidia_oc}/bin/nvidia_oc";
     in
-    lib.mkIf cfg.enable (lib.recursiveUpdate nvidiaOption {
-      boot.kernelParams =
-        [ "nvidia-drm.fbdev=1" "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
-      services.xserver.videoDrivers = [ "nvidia" ];
-      services.xserver.deviceSection = ''
-        Option "Coolbits" "24"
-      '';
-      hardware.nvidia = {
-        # Modesetting is required.
-        modesetting.enable = true;
-        # Open drivers with gsp stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631
-        gsp.enable = config.hardware.nvidia.open;
-        # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-        powerManagement.enable = false;
-        # Fine-grained power management. Turns off GPU when not in use.
-        # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-        powerManagement.finegrained = false;
-        # Use the NVidia open source kernel module (not to be confused with the
-        # independent third-party "nouveau" open source driver).
-        # Support is limited to the Turing and later architectures. Full list of 
-        # supported GPUs is at: 
-        # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
-        # Only available from driver 515.43.04+
-        # GSP must be enabled for this to work.
-        open = false;
-        # Enable the Nvidia settings menu,
-        # accessible via `nvidia-settings`.
-        nvidiaSettings = true;
-        # Optionally, you may need to select the appropriate driver version for your specific GPU.
-        package = config.boot.kernelPackages.nvidiaPackages.beta;
+    lib.mkIf cfg.enable (
+      lib.recursiveUpdate nvidiaOption {
+        boot.kernelParams = [
+          "nvidia-drm.fbdev=1"
+          "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
+        ];
+        services.xserver.videoDrivers = [ "nvidia" ];
+        services.xserver.deviceSection = ''
+          Option "Coolbits" "24"
+        '';
+        hardware.nvidia = {
+          # Modesetting is required.
+          modesetting.enable = true;
+          # Open drivers with gsp stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631
+          gsp.enable = config.hardware.nvidia.open;
+          # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+          powerManagement.enable = false;
+          # Fine-grained power management. Turns off GPU when not in use.
+          # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+          powerManagement.finegrained = false;
+          # Use the NVidia open source kernel module (not to be confused with the
+          # independent third-party "nouveau" open source driver).
+          # Support is limited to the Turing and later architectures. Full list of
+          # supported GPUs is at:
+          # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+          # Only available from driver 515.43.04+
+          # GSP must be enabled for this to work.
+          open = false;
+          # Enable the Nvidia settings menu,
+          # accessible via `nvidia-settings`.
+          nvidiaSettings = true;
+          # Optionally, you may need to select the appropriate driver version for your specific GPU.
+          package = config.boot.kernelPackages.nvidiaPackages.beta;
           #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
           #  version = "570.124.04";
           #  sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q=";
@@ -85,40 +100,35 @@ in {
           #  settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8=";
           #  persistencedSha256 = "";
           #};
-      };
+        };
 
-      environment.systemPackages = with pkgs; [
-        vaapiVdpau
-        libvdpau-va-gl
-        libva
-        libva-utils
-        pkgs.nvidia_oc
-        (gwe.override { nvidia_x11 = config.hardware.nvidia.package; })
-      ];
+        environment.systemPackages = with pkgs; [
+          vaapiVdpau
+          libvdpau-va-gl
+          libva
+          libva-utils
+          pkgs.nvidia_oc
+          (gwe.override { nvidia_x11 = config.hardware.nvidia.package; })
+        ];
 
-      environment.sessionVariables = {
-        # for firefox, see https://github.com/elFarto/nvidia-vaapi-driver/#firefox
-        MOZ_DISABLE_RDD_SANDBOX = "1";
-        LIBVA_DRIVER_NAME = "nvidia";
-      };
+        environment.sessionVariables = {
+          # for firefox, see https://github.com/elFarto/nvidia-vaapi-driver/#firefox
+          MOZ_DISABLE_RDD_SANDBOX = "1";
+          LIBVA_DRIVER_NAME = "nvidia";
+        };
 
-      systemd.services.nvidiaSetPower = lib.mkIf cfg.powerLimit.enable {
-        description =
-          "Increase GPU power limit to ${toString cfg.powerLimit.wattage} watts";
-        script = "/run/current-system/sw/bin/nvidia-smi -pl=${
-          toString cfg.powerLimit.wattage
-        }";
-        wantedBy = [ "multi-user.target" ];
-      };
-      systemd.services.nvidiaSetClocks = lib.mkIf cfg.clock.enable {
-        description = "Set GPU clocks";
-        script =
-          "${nvidia_oc} set -i 0 --min-clock ${toString cfg.clock.min} --max-clock ${
-          toString cfg.clock.max
-        } --freq-offset ${toString cfg.clock.offset}";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-      };
+        systemd.services.nvidiaSetPower = lib.mkIf cfg.powerLimit.enable {
+          description = "Increase GPU power limit to ${toString cfg.powerLimit.wattage} watts";
+          script = "/run/current-system/sw/bin/nvidia-smi -pl=${toString cfg.powerLimit.wattage}";
+          wantedBy = [ "multi-user.target" ];
+        };
+        systemd.services.nvidiaSetClocks = lib.mkIf cfg.clock.enable {
+          description = "Set GPU clocks";
+          script = "${nvidia_oc} set -i 0 --min-clock ${toString cfg.clock.min} --max-clock ${toString cfg.clock.max} --freq-offset ${toString cfg.clock.offset}";
+          wantedBy = [ "multi-user.target" ];
+          after = [ "network.target" ];
+        };
 
-    });
+      }
+    );
 }