Move everything to uwsm

1 files changed, 69 insertions, 72 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 6883d55..09beecf 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -16,26 +16,23 @@ monitor = , highres highrr, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = hyprpm reload -n
-exec-once = xdph
-exec-once = hyprpaper
+# These are for systems with no systemd
+#exec-once = hyprpm reload -n
+#exec-once = pypr
+#exec-once = bl-save
+#exec-once = hyprpaper
 #exec-once = hypridle
-exec-once = waybar
-exec-once = pypr
-#exec-once = hyprscratch init
-exec-once = lxqt-policykit-agent
-exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest'
-exec-once = import-gsettings icon-theme 'Papirus-Dark'
-exec-once = import-gsettings cursor-theme 'BreezeX-Black'
-exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
-exec-once = com.github.wwmm.easyeffects
-exec-once = systemctl --user restart dunst
-exec-once = systemctl --user restart hypridle
-exec-once = xwayland-satellite :1
-exec-once = bl-save
+#exec-once = waybar
+#exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
+#exec-once = dunst
+#exec-once = hypridle
+#exec-once = xwayland-satellite :1
 #exec-once = mpd
+# These are for systems with uwsm/systemd
+exec-once = uwsm app -- hyprpm reload -n
+exec-once = uwsm app -- xdph
+exec-once = uwsm app -- pypr
+exec-once = uwsm app -- bl-save
 #}}}
 
 #{{{ env
@@ -264,7 +261,7 @@ $secdMod = ALT
 
 #{{{ Layout toggle bind
 # Layout toggle
-#bind = $mainMod $secdMod, A, exec, hypr-layout -t
+#bind = $mainMod $secdMod, A, exec, uwsm app -- hypr-layout -t
 #}}}
 
 #{{{ Master layout binds
@@ -316,17 +313,17 @@ bind = $mainMod+ALT, K, changegroupactive, b
 #}}}
 
 #{{{ Device binds
-bind = $mainMod, Backspace, exec, touchpad.sh
+bind = $mainMod, Backspace, exec, uwsm app -- touchpad.sh
 #}}}
 
 #{{{ WC binds
 bind = $mainMod SHIFT, Q, killactive, 
-bind = $mainMod SHIFT, E, exit, 
+bind = $mainMod SHIFT, E, exec, uwsm stop
 bind = $mainMod SHIFT, SPACE, togglefloating, 
-bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh
+bind = $mainMod $secdMod, F2, exec, uwsm app -- ~/.config/hypr/gamemode.sh
 bind = $mainMod, F, fullscreen, 0
 bind = $mainMod, M, fullscreen, 1
-bind = $mainMod, N, exec, pypr toggle_special
+bind = $mainMod, N, exec, uwsm app -- pypr toggle_special
 bind = $mainMod SHIFT, N, togglespecialworkspace, minimized
 #}}}
 
@@ -423,46 +420,46 @@ submap = reset
 #}}}
 
 #{{{ Menu bindings
-bind = $mainMod, E, exec, sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical"
-bind = $mainMod, D, exec, sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)"
-bind = $mainMod, R, exec, rs
-bind = $mainMod $secdMod, Q, exec, qbc
-bind = $mainMod $secdMod, W, exec, lwc
-bind = $mainMod $secdMod, E, exec, brc
-bind = $mainMod $secdMod, R, exec, ffc
-bind = $mainMod $secdMod, 1, exec, bm
-bind = $mainMod $secdMod, comma, exec, dmount -p
-bind = $mainMod $secdMod, period, exec, dmenuumount
-bind = $mainMod $secdMod CONTROL, U, exec, dmenuunicode
-bind = $mainMod $secdMod, U, exec, mprisctl
-bind = $mainMod $secdMod, P, exec, passmenu
+bind = $mainMod, E, exec, uwsm app -- sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical"
+bind = $mainMod, D, exec, uwsm app -- sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)"
+bind = $mainMod, R, exec, uwsm app -- rs
+bind = $mainMod $secdMod, Q, exec, uwsm app -- qbc
+bind = $mainMod $secdMod, W, exec, uwsm app -- lwc
+bind = $mainMod $secdMod, E, exec, uwsm app -- brc
+bind = $mainMod $secdMod, R, exec, uwsm app -- ffc
+bind = $mainMod $secdMod, 1, exec, uwsm app -- bm
+bind = $mainMod $secdMod, comma, exec, uwsm app -- dmount -p
+bind = $mainMod $secdMod, period, exec, uwsm app -- dmenuumount
+bind = $mainMod $secdMod CONTROL, U, exec, uwsm app -- dmenuunicode
+bind = $mainMod $secdMod, U, exec, uwsm app -- mprisctl
+bind = $mainMod $secdMod, P, exec, uwsm app -- passmenu
 #}}}
 
 #{{{ Misc bindings
-bind = $mainMod, Return, exec, kitty
-bind = $mainMod $secdMod, F, exec, kitty lf
-bind = $mainMod, W, exec, pkill -USR1 waybar
-bind = $mainMod, Q, exec, loginctl lock-session
-bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend
-bind = $mainMod SHIFT, G, exec, get-app-id
-bind = $mainMod Control, M, exec, volsv -m
-#bind = $mainMod, Comma, exec, acpi-notify.sh
-#bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1
+bind = $mainMod, Return, exec, uwsm app -- kitty
+bind = $mainMod $secdMod, F, exec, uwsm app -- kitty lf
+bind = $mainMod, W, exec, uwsm app -- pkill -USR1 waybar
+bind = $mainMod, Q, exec, uwsm app -- loginctl lock-session
+bind = $mainMod $secdMod CONTROL, Q, exec, uwsm app -- systemctl suspend
+bind = $mainMod SHIFT, G, exec, uwsm app -- get-app-id
+bind = $mainMod Control, M, exec, uwsm app -- volsv -m
+#bind = $mainMod, Comma, exec, uwsm app -- acpi-notify.sh
+#bind = $mainMod CONTROL, R, exec, uwsm app -- startx -- /usr/bin/Xephyr -screen 1920x1080 :1
 #}}}
 
 #{{{ Scratchpads
-bind = $mainMod CONTROL, Z, exec, pypr toggle sphtop
-bind = $mainMod CONTROL, X, exec, pypr toggle spterm
-bind = $mainMod CONTROL, C, exec, pypr toggle sppmxr
-bind = $mainMod CONTROL, V, exec, pypr toggle spblue
-bind = $mainMod CONTROL, B, exec, pypr toggle spncmp
-bind = $mainMod CONTROL, A, exec, pypr toggle spmutt
-bind = $mainMod CONTROL, S, exec, pypr toggle spprof
-bind = $mainMod CONTROL, D, exec, pypr toggle spirss
-bind = $mainMod CONTROL, F, exec, pypr toggle spvimw
-bind = $mainMod CONTROL, G, exec, pypr toggle sptrmc
-bind = $mainMod CONTROL, Q, exec, pypr toggle helvum
-bind = $mainMod CONTROL, E, exec, pypr toggle easyfx
+bind = $mainMod CONTROL, Z, exec, uwsm app -- pypr toggle sphtop
+bind = $mainMod CONTROL, X, exec, uwsm app -- pypr toggle spterm
+bind = $mainMod CONTROL, C, exec, uwsm app -- pypr toggle sppmxr
+bind = $mainMod CONTROL, V, exec, uwsm app -- pypr toggle spblue
+bind = $mainMod CONTROL, B, exec, uwsm app -- pypr toggle spncmp
+bind = $mainMod CONTROL, A, exec, uwsm app -- pypr toggle spmutt
+bind = $mainMod CONTROL, S, exec, uwsm app -- pypr toggle spprof
+bind = $mainMod CONTROL, D, exec, uwsm app -- pypr toggle spirss
+bind = $mainMod CONTROL, F, exec, uwsm app -- pypr toggle spvimw
+bind = $mainMod CONTROL, G, exec, uwsm app -- pypr toggle sptrmc
+bind = $mainMod CONTROL, Q, exec, uwsm app -- pypr toggle helvum
+bind = $mainMod CONTROL, E, exec, uwsm app -- pypr toggle easyfx
 #}}}
 
 #{{{ OBS bindings
@@ -486,19 +483,19 @@ submap = reset
 #}}}
 
 #{{{ Media bindings
-bindl = $secdMod, P, exec, playerctl play-pause
-bindel = , XF86AudioRaiseVolume, exec, volsv -i 5
-bindel = , XF86AudioLowerVolume, exec, volsv -d 5
-bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioStop, exec, playerctl stop
-bind = , XF86AudioPrev, exec, playerctl previous
-bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioMute, exec, volsv -t
-#bindl = , XF86AudioMicMute, exec, volsv -m
-bind = , XF86AudioMicMute, exec, volsv -m
-bindel = , XF86MonBrightnessUp, exec, bl -i
-bindel = , XF86MonBrightnessDown, exec, bl -d
-bindl = $mainMod, XF86MonBrightnessUp, exec, bl -I 1
-bindl = $mainMod, XF86MonBrightnessDown, exec, bl -D 1
-bind = , Print, exec, scrshot
+bindl = $secdMod, P, exec, uwsm app -- playerctl play-pause
+bindel = , XF86AudioRaiseVolume, exec, uwsm app -- volsv -i 5
+bindel = , XF86AudioLowerVolume, exec, uwsm app -- volsv -d 5
+bind = , XF86AudioPlay, exec, uwsm app -- playerctl play-pause
+bind = , XF86AudioStop, exec, uwsm app -- playerctl stop
+bind = , XF86AudioPrev, exec, uwsm app -- playerctl previous
+bind = , XF86AudioNext, exec, uwsm app -- playerctl next
+bind = , XF86AudioMute, exec, uwsm app -- volsv -t
+#bindl = , XF86AudioMicMute, exec, uwsm app -- volsv -m
+bind = , XF86AudioMicMute, exec, uwsm app -- volsv -m
+bindel = , XF86MonBrightnessUp, exec, uwsm app -- bl -i
+bindel = , XF86MonBrightnessDown, exec, uwsm app -- bl -d
+bindl = $mainMod, XF86MonBrightnessUp, exec, uwsm app -- bl -I 1
+bindl = $mainMod, XF86MonBrightnessDown, exec, uwsm app -- bl -D 1
+bind = , Print, exec, uwsm app -- scrshot
 #}}}