diff --git a/hosts/pinwheel/modules/greetd/default.nix b/hosts/pinwheel/modules/greetd/default.nix
index e173689..4d93649 100644
--- a/hosts/pinwheel/modules/greetd/default.nix
+++ b/hosts/pinwheel/modules/greetd/default.nix
@@ -22,7 +22,7 @@ in
         let
           session = {
             user = "alex";
-            command = "${pkgs.hyprland}/bin/Hyprland";
+            command = "uwsm start hyprland-uwsm.desktop";
           };
         in
         {
diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix
index ed951d3..d8d5940 100644
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -74,6 +74,7 @@ in
   config = lib.mkIf enabled {
     programs.hyprland = {
       enable = true;
+      withUWSM = true;
       package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
       portalPackage =
         inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
@@ -86,10 +87,11 @@ in
     home-manager.users.alex = {
       wayland.windowManager.hyprland = {
         enable = true;
+        systemd.enable = false;
 
         extraConfig = ''
-          exec-once=waybar
-          exec-once=hyprctl setcursor Adwaita 24
+          exec-once = uwsm app -- waybar
+          exec-once = uwsm app -- hyprctl setcursor Adwaita 24
 
           env = GDK_DPI_SCALE,1.5
           env = HYPRCURSOR_THEME,Adwaita
@@ -109,7 +111,6 @@ in
           # https://wiki.archlinux.org/title/Hyprland#Jetbrains_apps_focus_issues
           windowrule = match:xwayland true, no_initial_focus on
 
-          exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
         '';
 
         settings = {