From cfdada0008791e2c3db29397e92fe6c4134f725a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Fri, 18 Jul 2025 11:31:59 +0200
Subject: [PATCH] Move shared nvidia settings to a separate module

---
 m/fox/configuration.nix     | 7 ++-----
 m/module/nvidia.nix         | 9 +++++++++
 m/raccoon/configuration.nix | 8 +++-----
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 m/module/nvidia.nix

diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix
index f1d967a6..fd5cdc8b 100644
--- a/m/fox/configuration.nix
+++ b/m/fox/configuration.nix
@@ -5,6 +5,7 @@
     ../common/base.nix
     ../common/xeon/console.nix
     ../module/emulation.nix
+    ../module/nvidia.nix
   ];
 
   # Select the this using the ID to avoid mismatches
@@ -53,12 +54,8 @@
     extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ];
   };
 
-  # Configure Nvidia driver to use with CUDA
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
+  # Recommended for new graphics cards
   hardware.nvidia.open = true;
-  hardware.graphics.enable = true;
-  nixpkgs.config.nvidia.acceptLicense = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
 
   # Mount NVME disks
   fileSystems."/nvme0" = { device = "/dev/disk/by-label/nvme0"; fsType = "ext4"; };
diff --git a/m/module/nvidia.nix b/m/module/nvidia.nix
new file mode 100644
index 00000000..0a80694b
--- /dev/null
+++ b/m/module/nvidia.nix
@@ -0,0 +1,9 @@
+{ lib, config, ... }:
+{
+  # Configure Nvidia driver to use with CUDA
+  hardware.nvidia.package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.production;
+  hardware.nvidia.open = lib.mkDefault (builtins.abort "hardware.nvidia.open not set");
+  hardware.graphics.enable = true;
+  nixpkgs.config.nvidia.acceptLicense = true;
+  services.xserver.videoDrivers = [ "nvidia" ];
+}
diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix
index 4a8a0ec4..440076ba 100644
--- a/m/raccoon/configuration.nix
+++ b/m/raccoon/configuration.nix
@@ -6,6 +6,7 @@
     ../module/emulation.nix
     ../module/debuginfod.nix
     ../module/ssh-hut-extern.nix
+    ../module/nvidia.nix
     ../eudy/kernel/perf.nix
   ];
 
@@ -49,11 +50,8 @@
   # Enable performance governor
   powerManagement.cpuFreqGovernor = "performance";
 
-  # Configure Nvidia driver to use with CUDA
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
-  hardware.graphics.enable = true;
-  nixpkgs.config.nvidia.acceptLicense = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
+  # Older graphics card, open driver not supported
+  hardware.nvidia.open = false;
 
   # Disable garbage collection for now
   nix.gc.automatic = lib.mkForce false;