From adbb497f80d2c7284494c6bc9d5944ad8f1481eb Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@gmail.com>
Date: Tue, 24 Oct 2023 12:45:40 +0200
Subject: [PATCH] [nvidia] Update settings

---
 nixos/hosts/Tibo-NixFat/default.nix       |  2 +-
 nixos/modules/hardware/nvidia/default.nix | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 7712d12..e88cf35 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -10,7 +10,7 @@
     users.tdpeuter.enable = true;
 
     hardware.nvidia.enable = true;
-    hardware.nvidia.model = "T2000";
+    hardware.nvidia.model = "Quadro T2000";
 
     programs = {
       home-manager.enable = true;
diff --git a/nixos/modules/hardware/nvidia/default.nix b/nixos/modules/hardware/nvidia/default.nix
index 34ba4e6..701fcac 100644
--- a/nixos/modules/hardware/nvidia/default.nix
+++ b/nixos/modules/hardware/nvidia/default.nix
@@ -14,25 +14,38 @@ in {
   options.sisyphus.hardware.nvidia = {
     enable = lib.mkEnableOption "NVIDIA GPU support";
     model = lib.mkOption {
-      type = lib.types.enum [ "" "T2000" "RTX 2060" ];
+      type = lib.types.enum [ "" "Quadro T2000" "RTX 2060" ];
       default = "";
-      example = "T2000";
+      example = "Quadro T2000";
       description = lib.mdDoc "The model of NVIDIA GPU card";
     };
+    gui-settings = lib.mkEnableOption "NVIDIA settings menu";
   };
 
   config = lib.mkIf cfg.enable {
     services.xserver.videoDrivers = [ "nvidia" ];
   
     hardware = {
-      opengl.enable = true;
+      opengl = {
+        enable = true;
+        driSupport = true;
+        driSupport32Bit = true;
+      };
       nvidia = {
         open = true;
         package = config.boot.kernelPackages.nvidiaPackages.stable;
         modesetting.enable = true;
+        nvidiaSettings = config.sisyphus.hardware.nvidia.gui-settings;
+        powerManagement = {
+          enable = true;
+          finegrained = true;
+        };
 
-        prime = lib.mkIf (cfg.model == "T2000") {
-          offload.enable = true;
+        prime = lib.mkIf (cfg.model == "Quadro T2000") {
+          offload = {
+            enable = true;
+            enableOffloadCmd = true;
+          };
           intelBusId = "PCI::00:02:0";
           nvidiaBusId = "PCI:01:00:0";
         };