diff --git a/flake.lock b/flake.lock
index c938af2..e6b78ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,11 +132,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767606757,
-        "narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=",
+        "lastModified": 1767619743,
+        "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c4eabb884b01366f25c3f80823b12dd595ed603a",
+        "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1767602452,
-        "narHash": "sha256-dtAvNihXmUiFC4npKNByp7UwW8hILrCzcc0ZnzejWgw=",
+        "lastModified": 1767646366,
+        "narHash": "sha256-zvbgX5YTof1kxHVQ5iRaQXw3PJ2PhTLIlxGk5J/2krQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "af0cd55eba4021bf93701eeab00e86018fb7aaf5",
+        "rev": "219274a265f05f24fbea676a975d0ddf37cbfe77",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767587590,
-        "narHash": "sha256-2OVoKCCZ4sCEZJ03LOaNJ9tDVIHCrxyk5/ME/UtqiC0=",
+        "lastModified": 1767621589,
+        "narHash": "sha256-L0A4daBtEuponvKr5YM4wn8btDku0Cs2Eu5b+EtTgSk=",
         "owner": "vicinaehq",
         "repo": "vicinae",
-        "rev": "5ea9b53a5febfc63ee6fc5010500ccaac974a6bf",
+        "rev": "b79669006c4e49e32f2ae889c1294cd62c8071d5",
         "type": "github"
       },
       "original": {
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 0ffa38e..d2ae56a 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -107,19 +107,17 @@ in {
 
     wayland.windowManager.hyprland = {
         enable = true;
-        systemd.variables = [ "--all" ];
-        systemd.enable = true;
-        systemd.enableXdgAutostart = true;
+        systemd.enable = false;
         xwayland.enable = true;
         plugins = [ ] ++ hyprland_plugins;
         settings = {
             "$mainMod" = pkgs.lib.mkDefault "SUPER_L";
             "$altMod" = pkgs.lib.mkDefault "ALT_L";
             exec-once = [
-                "hyprpaper"
-                "foot --server"
-                "hyprctl dispatch exec ags run"
-                "${pkgs.mate.mate-polkit}/bin/polkit-mate"
+                "uwsm app -- hyprpaper"
+                "uwsm app -- foot --server"
+                "uwsm app -- hyprctl dispatch exec ags run"
+                "uwsm app -- ${pkgs.mate.mate-polkit}/bin/polkit-mate"
             ];
             env = [
                 "WLR_NO_HARDWARE_CURSORS,1"
diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix
index c5d0967..4cee727 100644
--- a/hosts/Common/desktop.nix
+++ b/hosts/Common/desktop.nix
@@ -14,12 +14,13 @@
     };
     programs.hyprland = {
         enable = true;
+        withUWSM = true;
     };
     services.greetd = {
         enable = pkgs.lib.mkDefault true;
         settings = rec {
             initial_session = {
-                command = "Hyprland";
+                command = "uwsm start hyprland-uwsm.desktop";
                 user = "user";
             };
             default_session = initial_session;