diff --git a/home/programs/hyprland.nix b/home/programs/hyprland.nix
index 1412205..22270d9 100644
--- a/home/programs/hyprland.nix
+++ b/home/programs/hyprland.nix
@@ -91,7 +91,9 @@ in
 
   wayland.windowManager.hyprland = {
     enable = true;
+
     systemd.enable = false;
+    systemd.enableXdgAutostart = false;
 
     settings = let
       scratchpads = [
@@ -321,4 +323,12 @@ in
       };
     };
   };
+
+  # UWSM
+  systemd.user.services = {
+    hypridle.Unit.After = lib.mkForce "graphical-session.target";
+    xplugd.Unit.After = lib.mkForce "graphical-session.target";
+    waybar.Unit.After = lib.mkForce "graphical-session.target";
+    # hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
+  };
 }