diff --git a/flake.nix b/flake.nix
index 70ce1cae..18bb82ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,6 +135,12 @@
                 printer.enable = true;
                 sound.enable = true;
                 legion.enable = true;
+                prime =
+                {
+                  enable = true;
+                  mode = "sync";
+                  busId = { amdgpu = "PCI:8:0:0"; nvidia = "PCI:1:0:0"; };
+                };
               };
               packages.packageSet = "workstation";
               virtualization =
@@ -204,7 +210,7 @@
                   wireguardIp = "192.168.83.3";
                 };
               };
-              bugs = [ "xmunet" "suspend-hibernate-waydroid" "backlight" ];
+              bugs = [ "xmunet" "suspend-hibernate-waydroid" "backlight" "amdpstate" ];
             };
             vps6 =
             {
diff --git a/modules/bugs/default.nix b/modules/bugs/default.nix
index 5367e3de..19f54bf1 100644
--- a/modules/bugs/default.nix
+++ b/modules/bugs/default.nix
@@ -80,6 +80,7 @@ inputs:
       firefox.programs.firefox.enable = inputs.lib.mkForce false;
       power.boot.kernelParams = [ "cpufreq.default_governor=powersave" ];
       backlight.boot.kernelParams = [ "nvidia.NVreg_RegistryDwords=EnableBrightnessControl=1" ];
+      amdpstate.boot.kernelParams = [ "amd_pstate=active" ];
     };
   in
     {
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index a582b5be..1c687a3c 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -109,7 +109,7 @@ inputs:
                   {
                     intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver
                     nvidia = [ vaapiVdpau ];
-                    amd = [];
+                    amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
                   };
                 in
                   concatLists (map (gpu: packages.${gpu}) hardware.gpus);
@@ -126,7 +126,8 @@ inputs:
           };
         }
       )
-      (mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.deviceSection = ''Driver "modesetting"''; })
+      (mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
+      (mkIf (builtins.elem "amd" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
       # prime
       (
         mkIf hardware.prime.enable
@@ -151,7 +152,6 @@ inputs:
               prime = listToAttrs
                 (map (gpu: { inherit (gpu) value; name = "${gpu.name}BusId"; }) (attrsToList hardware.prime.busId));
             }
-            
           ];
         }
       )