diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 86b0e83..893051f 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -8,10 +8,10 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "kvm-amd" "amdgpu" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" "amdgpu" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower amdgpu-pro ];
   hardware.opengl.extraPackages = [ pkgs.amdvlk ];
   hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
 
@@ -19,35 +19,6 @@
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   ];
 
-  # my stupid usb hub crashes systemct suspend half of the time now
-  # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks
-  systemd.services.root-suspend = {
-    enable = true;
-    description = "Root systemd suspend prehook";
-    unitConfig = {
-      Description = "Root systemd suspend prehook";
-      Before = "sleep.target";
-    };
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a off";
-    };
-    wantedBy = [ "sleep.target" ];
-  };
-  systemd.services.root-resume = {
-    enable = true;
-    description = "Root systemd suspend posthook";
-    unitConfig = {
-      Description = "Root systemd suspend posthook";
-      After = "suspend.target";
-    };
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a on";
-    };
-    wantedBy = [ "suspend.target" ];
-  };
-
   services.btrfs.autoScrub = {
     enable = true;
     interval = "weekly";
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index 5cfa622..0b80863 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -136,7 +136,7 @@
        bind=,code:255,exec,airplane-mode
        bind=SUPER,C,exec,wl-copy $(hyprpicker)
 
-       bind=SUPERSHIFT,S,exec,systemctl suspend
+       bind=SUPERSHIFT,S,exec,hyprlock & sleep 1 && systemctl suspend
        bind=SUPERCTRL,L,exec,hyprlock
 
        bind=SUPER,H,movefocus,l
@@ -380,14 +380,20 @@
   ];
   home.file.".config/hypr/hypridle.conf".text = ''
     general {
-      lock_cmd = pgrep hyprlock || hyprlock
-      before_sleep_cmd = loginctl lock-session
+      lock_cmd = hyprlock
+      unlock_cmd =
+      before_sleep_cmd = hyprlock
+      after_sleep_cmd =
       ignore_dbus_inhibit = false
     }
 
     listener {
-      timeout = 600 # in seconds
-      on-timeout = loginctl lock-session
+      timeout = 360 # in seconds
+      on-timeout = hyprlock
+      on-resume =
+      timeout = 720 # in seconds
+      on-timeout = systemctl suspend
+      on-resume =
     }
   '';
   home.file.".config/hypr/hyprlock.conf".text = ''