diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index 63797ce..fbfb259 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -25,9 +25,6 @@
     enable32Bit = true;
   };
 
-  # Try to fix amdgpu
-  boot.initrd.kernelModules = ["amdgpu"];
-  services.xserver.videoDrivers = ["amdgpu"];
 
   # Enable networking
   networking.networkmanager.enable = true;
diff --git a/modules/nixos/amdgpu.nix b/modules/nixos/amdgpu.nix
new file mode 100644
index 0000000..41d5812
--- /dev/null
+++ b/modules/nixos/amdgpu.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  options = {
+    crony.amdgpu.enable = lib.mkEnableOption "Load amdgpu modules at boot.";
+  };
+
+  config = lib.mkIf config.crony.amdgpu.enable {
+    # Try to fix amdgpu
+    boot.initrd.kernelModules = ["amdgpu"];
+    services.xserver.videoDrivers = ["amdgpu"];
+  };
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index c6dd643..6cd5432 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -10,6 +10,7 @@
     ./nbfc.nix
     ./ryzenadj.nix
     ./qemu.nix
+    ./amdgpu.nix
   ];
 
   crony.bluetooth.enable = lib.mkDefault true;
@@ -22,4 +23,5 @@
   crony.nbfc.enable = lib.mkDefault true;
   crony.ryzenadj.enable = lib.mkDefault true;
   crony.qemu.enable = lib.mkDefault true;
+  crony.amdgpu.enable = lib.mkDefault true;
 }