From 60229953ee6c0bfca187d335b9f24623177b167d Mon Sep 17 00:00:00 2001
From: Pedro Rey Anca <personal@peprolinbot.com>
Date: Wed, 9 Jul 2025 14:25:59 +0200
Subject: [PATCH] Use UWSM

---
 modules/core/wayland.nix           | 10 ++++--
 modules/home/hyprland/config.nix   | 55 +++++++++++++++---------------
 modules/home/hyprland/hyprland.nix |  2 +-
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/modules/core/wayland.nix b/modules/core/wayland.nix
index edfa3be..f00a3f5 100644
--- a/modules/core/wayland.nix
+++ b/modules/core/wayland.nix
@@ -4,7 +4,11 @@
   username,
   ...
 }: {
-  programs.hyprland.enable = true;
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+  };
+
   xdg.portal = {
     enable = true;
     wlr.enable = true;
@@ -30,9 +34,11 @@
     };
     cageArgs = ["-s" "-m" "last"]; # Only show on the last monitor
   };
+
   services.greetd.settings.initial_session = {
-    command = "Hyprland";
+    command = "uwsm start hyprland-uwsm.desktop";
     user = "${username}";
   };
+
   environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";
 }
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index c67692f..781817d 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -3,15 +3,15 @@
     settings = {
       # autostart
       exec-once = [
-        "nm-applet &"
-        "wl-clip-persist --clipboard regular &"
-        "bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'"
-        "swaybg -m fill -i ~/.config/hypr/wallpaper.png &"
-        "poweralertd &"
-        "waybar &"
-        "swaync &"
-        "ckb-next -b &"
-        "element-desktop --hidden &"
+        "uwsm app -- nm-applet"
+        "uwsm app -- wl-clip-persist --clipboard regular"
+        "uwsm app -- bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'"
+        "uwsm app -- swaybg -m fill -i ~/.config/hypr/wallpaper.png &"
+        "uwsm app -- poweralertd"
+        "uwsm app -- waybar"
+        "uwsm app -- swaync"
+        "uwsm app -- ckb-next -b"
+        "uwsm app -- element-desktop --hidden"
       ];
 
       input = {
@@ -126,32 +126,33 @@
           "$mainMod, F1, exec, show-keybinds"
 
           # keybindings
-          "$mainMod, Return, exec, kitty"
-          "ALT, Return, exec, kitty --title float_kitty"
-          "$mainMod SHIFT, Return, exec, kitty --start-as=fullscreen -o 'font_size=16'"
-          "$mainMod, B, exec, librewolf"
-          "$mainMod, N, exec, swaync-client -t"
-          "$mainMod SHIFT, N, exec, swaync-client -d"
+          "$mainMod, Return, exec, uwsm app -- kitty"
+          "ALT, Return, exec, uwsm app -- kitty --title float_kitty"
+          "$mainMod SHIFT, Return, exec, uwsm app -- kitty --start-as=fullscreen -o 'font_size=16'"
+          "$mainMod, B, exec, uwsm app -- librewolf"
+          "$mainMod, N, exec, uwsm app -- swaync-client -t"
+          "$mainMod SHIFT, N, exec, uwsm app -- swaync-client -d"
           "$mainMod SHIFT, Q, killactive,"
           "$mainMod, F, fullscreen, 0"
           "$mainMod SHIFT, F, fullscreen, 1"
           "$mainMod, Space, togglefloating,"
-          "$mainMod, D, exec, fuzzel"
-          "$mainMod SHIFT, E, exec, bemoji -n"
-          "$mainMod, M, exec, element-desktop"
-          "$mainMod, Y, exec, kitty spotify_player"
-          "$mainMod, Escape, exec, loginctl lock-session"
-          "$mainMod SHIFT, Escape, exec, shutdown-script"
+          "$mainMod, D, exec, uwsm app -- fuzzel"
+          "$mainMod SHIFT, E, exec, uwsm app -- bemoji -n"
+          "$mainMod, M, exec, uwsm app -- element-desktop"
+          "$mainMod, Y, exec, uwsm app -- kitty spotify_player"
+          "$mainMod, X, exec, uwsm app -- rofi-rbw"
+          "$mainMod, Escape, exec, uwsm app -- loginctl lock-session"
+          "$mainMod SHIFT, Escape, exec, uwsm app -- shutdown-script"
           "$mainMod, P, pseudo,"
           "$mainMod SHIFT, P, togglesplit,"
-          "$mainMod, E, exec, nemo"
-          "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
-          "$mainMod, C ,exec, hyprpicker -a"
-          "$mainMod, W,exec, wallpaper-picker"
+          "$mainMod, E, exec, uwsm app -- nemo"
+          "$mainMod SHIFT, B, exec, uwsm app -- pkill -SIGUSR1 .waybar-wrapped"
+          "$mainMod, C ,exec, uwsm app -- hyprpicker -a"
+          "$mainMod, W,exec, uwsm app -- wallpaper-picker"
 
           # screenshot
-          "$mainMod, Print, exec, screenshot-menu"
-          ",Print, exec, grimblast --notify --freeze copy area"
+          "$mainMod, Print, exec, uwsm app -- screenshot-menu"
+          ",Print, exec, uwsm app -- grimblast --notify --freeze copy area"
         ]
         ++ (
           # workspaces
diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
index 8fa7f5b..d4ca52a 100644
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -23,7 +23,7 @@
       # hidpi = true;
     };
     # enableNvidiaPatches = false;
-    systemd.enable = true;
+    systemd.enable = false;
   };
 
   services.hyprpolkitagent.enable = true;