diff --git a/modules/amd-graphics.nix b/modules/amd-graphics.nix
index ec9ec02..4ae15ac 100644
--- a/modules/amd-graphics.nix
+++ b/modules/amd-graphics.nix
@@ -1,12 +1,19 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   config = {
     boot.kernelModules = [ "amdgpu" ];
     services.xserver.videoDrivers = [ "amdgpu" ];
 
-    hardware.graphics = {
-      extraPackages = with pkgs; [ amdvlk ];
-      extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
+    hardware = {
+      graphics.enable = true;
+      amdgpu = {
+        opencl.enable = true;
+        amdvlk = {
+          # TODO: this creates black borders around GNOME apps
+          # enable = true;
+          support32Bit.enable = config.hardware.graphics.enable32Bit;
+        };
+      };
     };
 
     environment.systemPackages = with pkgs; [ nvtopPackages.amd ];