diff --git a/hardware/amdgpu.nix b/hardware/amdgpu.nix
new file mode 100644
index 0000000..cce5773
--- /dev/null
+++ b/hardware/amdgpu.nix
@@ -0,0 +1,20 @@
+{ pkgs, config, ... }: {
+
+    # Make the kernel use the correct driver early
+    boot.initrd.kernelModules = [ "amdgpu" ];
+
+    # For 32 bit applications
+    hardware.opengl.driSupport32Bit = true;
+
+    # AMDVLK drivers can be used in addition to the Mesa RADV drivers
+    hardware.opengl.extraPackages = with pkgs; [
+        amdvlk
+        rocmPackages.clr.icd
+    ];
+
+    environment.systemPackages = with pkgs; [
+        nvtop-amd
+        clinfo
+        rocmPackages.clr
+    ];
+}
diff --git a/hardware/default.nix b/hardware/default.nix
new file mode 100644
index 0000000..3c7f6bd
--- /dev/null
+++ b/hardware/default.nix
@@ -0,0 +1,5 @@
+{
+    imports = [
+        ./amdgpu.nix
+    ];
+}
diff --git a/users/servostar/user.nix b/users/servostar/user.nix
index eff8ba9..786db0d 100644
--- a/users/servostar/user.nix
+++ b/users/servostar/user.nix
@@ -51,7 +51,6 @@
       btop
       htop
       tmux
-      nvtop-amd
       asciiquarium
       pipes
       tldr