From 62e5a7a23b9a3cb11440ce8d5d96b4fc99d9cecf Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Sun, 27 Apr 2025 08:26:24 -0400
Subject: [PATCH] Fix program launch / session control to work with uwsm

---
 README.org    | 32 ++++++++++++++++++--------------
 hyprland.conf | 28 ++++++++++++++--------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/README.org b/README.org
index df91789..a65de8f 100644
--- a/README.org
+++ b/README.org
@@ -294,6 +294,10 @@ device {
 - [[https://wiki.hyprland.org/Configuring/Keywords/][Hyprland Wiki - Configuring - Keywords]]
 - [[https://wiki.hyprland.org/Configuring/Binds/][Hyprland Wiki - Configuring - Binds]]
 
+#+BEGIN_EXAMPLE
+bind = MODS, key, dispatcher, params
+#+END_EXAMPLE
+
 *** Mod Key
 
 #+BEGIN_SRC conf :tangle hyprland.conf
@@ -303,25 +307,25 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 *** Session Control
 
 #+BEGIN_SRC conf :tangle hyprland.conf
-bind = $mainMod SHIFT, Q, exit,
+bind = $mainMod SHIFT, Q, exec, loginctl terminate-user ""
 #+END_SRC
 
 *** Launch Programs
 
 #+BEGIN_SRC conf :tangle hyprland.conf
-bind = $mainMod SHIFT, Return, exec, $terminal
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, P, exec, $menu
+bind = $mainMod SHIFT, Return, exec, uwsm app -- $terminal
+bind = $mainMod, E, exec, uwsm app -- $fileManager
+bind = $mainMod, P, exec, uwsm app -- $menu
 #+END_SRC
 
 *** Control Windows / Layout
 
 #+BEGIN_SRC conf :tangle hyprland.conf
-bind = $mainMod SHIFT, C, killactive,
+bind = $mainMod SHIFT, C, killactive
 bind = $mainMod SHIFT, F, fullscreen
-bind = $mainMod, F, togglefloating,
-bind = $mainMod, D, pseudo, # dwindle
-bind = $mainMod, S, togglesplit, # dwindle
+bind = $mainMod, F, togglefloating
+bind = $mainMod, D, pseudo # dwindle
+bind = $mainMod, S, togglesplit # dwindle
 #+END_SRC
 
 *** Move Focus
@@ -401,12 +405,12 @@ bindm = $mainMod, mouse:273, resizewindow
 Laptop multimedia keys for volume and LCD brightness
 
 #+BEGIN_SRC conf :tangle hyprland.conf
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = , XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = , XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = , XF86MonBrightnessDown, exec, brightnessctl s 10%-
 #+END_SRC
 
 *** Media Controls
diff --git a/hyprland.conf b/hyprland.conf
index 634e8a9..dcdf789 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -114,17 +114,17 @@ gestures {
 
 $mainMod = SUPER # Sets "Windows" key as main modifier
 
-bind = $mainMod SHIFT, Q, exit,
+bind = $mainMod SHIFT, Q, exec, loginctl terminate-user ""
 
-bind = $mainMod SHIFT, Return, exec, $terminal
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, P, exec, $menu
+bind = $mainMod SHIFT, Return, exec, uwsm app -- $terminal
+bind = $mainMod, E, exec, uwsm app -- $fileManager
+bind = $mainMod, P, exec, uwsm app -- $menu
 
-bind = $mainMod SHIFT, C, killactive,
+bind = $mainMod SHIFT, C, killactive
 bind = $mainMod SHIFT, F, fullscreen
-bind = $mainMod, F, togglefloating,
-bind = $mainMod, D, pseudo, # dwindle
-bind = $mainMod, S, togglesplit, # dwindle
+bind = $mainMod, F, togglefloating
+bind = $mainMod, D, pseudo # dwindle
+bind = $mainMod, S, togglesplit # dwindle
 
 bind = $mainMod, H, movefocus, l
 bind = $mainMod, L, movefocus, r
@@ -159,12 +159,12 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = , XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = , XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = , XF86MonBrightnessDown, exec, brightnessctl s 10%-
 
 bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPause, exec, playerctl play-pause