diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix
index 3f4bc38..4ae0874 100644
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -38,6 +38,7 @@ in
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker
     ../../modules/syncthing
+    ../../modules/nvidia
   ];
 
   home-manager.users.${username} = import ../../home/hosts/andromache {
@@ -79,18 +80,7 @@ in
     };
   };
 
-  hardware = {
-    cpu.intel.updateMicrocode = true;
-    graphics.enable = true;
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      powerManagement.finegrained = false;
-      open = true;
-      nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-    };
-  };
+  hardware.cpu.intel.updateMicrocode = true;
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
@@ -99,19 +89,15 @@ in
   ];
 
   services = {
-    xserver = {
-      videoDrivers = [ "nvidia" ];
+    locate = {
+      enable = true;
+      package = pkgs.plocate;
     };
 
     openssh = {
       enable = true;
       harden = true;
     };
-    locate = {
-      enable = true;
-      package = pkgs.plocate;
-    };
-  };
 
   my.syncthing.enable = true;
 
diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix
new file mode 100644
index 0000000..c0faa11
--- /dev/null
+++ b/modules/nvidia/default.nix
@@ -0,0 +1,22 @@
+{ config, ... }:
+
+{
+  nixpkgs.allowedUnfree = [
+    "nvidia-x11"
+    "nvidia-persistenced"
+    "nvidia-settings"
+  ];
+
+  hardware.graphics.enable = true;
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = true;
+    powerManagement.finegrained = false;
+    open = true;
+    nvidiaSettings = true;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+}