diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix
index f1d967a..fd5cdc8 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 0000000..3db4071
--- /dev/null
+++ b/m/module/nvidia.nix
@@ -0,0 +1,9 @@
+{ lib, config, ... }:
+{
+  # Configure Nvidia driver to use with CUDA
+  hardware.nvidia.package = 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 cee936a..46f63f5 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,12 +50,7 @@
   # Enable performance governor
   powerManagement.cpuFreqGovernor = "performance";
 
-  # Configure Nvidia driver to use with CUDA
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
   hardware.nvidia.open = false; # Maxwell is older than Turing architecture
-  hardware.graphics.enable = true;
-  nixpkgs.config.nvidia.acceptLicense = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
 
   services.openssh.settings.X11Forwarding = true;