Nvidia experimental suspend

nikitawootten · Dec 19, 2023 · 01233bc · 01233bc
1 parent 5d4b78a
commit 01233bc
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/hostModules/personal/nvidia.nix b/hostModules/personal/nvidia.nix
@@ -11,6 +11,7 @@ in
       default = true;
     };
     betaDriver = lib.mkEnableOption "enable beta driver";
+    suspend = lib.mkEnableOption "enable experimental suspend";
   };
 
   config = lib.mkIf cfg.enable {
@@ -25,14 +26,19 @@ in
     services.xserver.videoDrivers = ["nvidia"];
 
     hardware.nvidia = {
-      modesetting.enable = true;
-      open = false;
-      nvidiaSettings = !cfg.headless;
-      package = if cfg.betaDriver
-        then config.boot.kernelPackages.nvidiaPackages.beta
-        else config.boot.kernelPackages.nvidiaPackages.stable;
+      modesetting.enable = lib.mkDefault true;
+      open = lib.mkDefault false;
+      nvidiaSettings = lib.mkDefault (!cfg.headless);
+      package = lib.mkDefault (
+        if cfg.betaDriver
+          then config.boot.kernelPackages.nvidiaPackages.beta
+          else config.boot.kernelPackages.nvidiaPackages.stable
+        );
+      powerManagement.enable = lib.mkDefault cfg.suspend;
     };
 
+    boot.kernelParams = lib.lists.optional cfg.betaDriver "nvidia.NVreg_PreserveVideoMemoryAllocations=1";
+
     virtualisation.docker.enableNvidia = true;
   };
 }
diff --git a/hosts/dionysus/default.nix b/hosts/dionysus/default.nix
@@ -1,4 +1,4 @@
-{ self, nixos-hardware, ... }:
+{ self, pkgs, nixos-hardware, ... }:
 {
   imports = [
     ./hardware-configuration.nix
@@ -20,6 +20,13 @@
   personal.nvidia = {
     enable = true;
     headless = false;
+    suspend = true;
+  };
+
+  hardware.opengl = {
+    enable = true;
+    driSupport32Bit = true;
+    extraPackages = with pkgs; [nvidia-vaapi-driver];
   };
 
   personal.zsa.enable = true;