diff --git a/modules/core/hyprland.nix b/modules/core/hyprland.nix
index 6a4fe3f..48b9f97 100644
--- a/modules/core/hyprland.nix
+++ b/modules/core/hyprland.nix
@@ -11,6 +11,7 @@ in
   config = mkIf cfg.enable {
     programs.hyprland = {
       enable = true;
+      withUWSM = true;
     };
   };
 }
\ No newline at end of file
diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
index 828b439..940908a 100644
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -11,17 +11,10 @@ let
   cfg = osConfig.modules.hyprland;
 in
 {
-  systemd.user.targets.hyprland-session.Unit.Wants = [
-    "xdg-desktop-autostart.target"
-  ];
-
   wayland.windowManager.hyprland = {
     enable = cfg.enable;
     package = pkgs.hyprland;
-    systemd = {
-      enable = true;
-      enableXdgAutostart = true;
-    };
+    systemd.enable = false;
     xwayland.enable = true;
     settings = {
       monitor = cfg.monitor;