Merge branch 'master' into macmac

2 files changed, 15 insertions, 15 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 3046748..c09dc9f 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -104,7 +104,7 @@ misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
     enable_swallow = true
-    swallow_regex = ^(kitty)$
+    swallow_regex = ^(st-256color)$
     swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
     vfr = true
     vrr = 3
@@ -192,9 +192,9 @@ plugin {
 
 #{{{ Windowrules
 # Example windowrule v1
-# windowrule = float, ^(kitty)$
+# windowrule = float, ^(st)$
 # Example windowrule v2
-# windowrule = float, class:^(kitty)$, title:^(kitty)$
+# windowrule = float, class:^(st)$, title:^(st)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 #}}}
 
@@ -322,8 +322,8 @@ bind = $mainMod $secdMod, P, exec, passmenu
 #}}}
 
 #{{{ Misc bindings
-bind = $mainMod, Return, exec, kitty
-bind = $mainMod $secdMod, F, exec, kitty -e lf
+bind = $mainMod, Return, exec, st
+bind = $mainMod $secdMod, F, exec, st lfrun
 bind = $mainMod, W, exec, pkill -USR1 waybar
 bind = $mainMod, Q, exec, loginctl lock-session
 bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend
diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml
index a0aa176..038e8dc 100644
--- a/hypr/pyprland.toml
+++ b/hypr/pyprland.toml
@@ -7,7 +7,7 @@ plugins = [
 
 [scratchpads.sphtop]
 animation = ""
-command = "kitty --class sphtop htop"
+command = "st -c sphtop htop"
 class = "sphtop"
 lazy = true
 size = "50% 50%"
@@ -15,7 +15,7 @@ position = "25% 25%"
 
 [scratchpads.spterm]
 animation = ""
-command = "kitty --class spterm"
+command = "st -c spterm"
 class = "spterm"
 lazy = true
 size = "50% 50%"
@@ -23,7 +23,7 @@ position = "25% 25%"
 
 [scratchpads.sppmxr]
 animation = ""
-command = "kitty --class sppmxr pulsemixer"
+command = "st -c sppmxr pulsemixer"
 class = "sppmxr"
 lazy = true
 size = "50% 50%"
@@ -31,7 +31,7 @@ position = "25% 25%"
 
 [scratchpads.spblue]
 animation = ""
-command = "kitty --class spblue bluetoothctl"
+command = "st -c spblue bluetoothctl"
 class = "spblue"
 lazy = true
 size = "50% 50%"
@@ -39,7 +39,7 @@ position = "25% 25%"
 
 [scratchpads.spncmp]
 animation = ""
-command = "kitty --class spncmp ncmpcpp"
+command = "st -c spncmp ncmpcpp"
 class = "spncmp"
 lazy = true
 size = "50% 50%"
@@ -47,7 +47,7 @@ position = "25% 25%"
 
 [scratchpads.spmutt]
 animation = ""
-command = "kitty --class spmutt neomutt"
+command = "st -c spmutt neomutt"
 class = "spmutt"
 lazy = true
 size = "50% 50%"
@@ -55,7 +55,7 @@ position = "25% 25%"
 
 [scratchpads.spprof]
 animation = ""
-command = "kitty --class spprof profanity"
+command = "st -c spprof profanity"
 class = "spprof"
 lazy = true
 size = "50% 50%"
@@ -63,7 +63,7 @@ position = "25% 25%"
 
 [scratchpads.spirss]
 animation = ""
-command = "kitty --class spirss irssi"
+command = "st -c spirss irssi"
 class = "spirss"
 lazy = true
 size = "50% 50%"
@@ -71,7 +71,7 @@ position = "25% 25%"
 
 [scratchpads.sptodo]
 animation = ""
-command = "kitty --class sptodo todo"
+command = "st -c sptodo todo"
 class = "sptodo"
 lazy = true
 size = "50% 50%"
@@ -79,7 +79,7 @@ position = "25% 25%"
 
 [scratchpads.sptrmc]
 animation = ""
-command = "kitty --class sptrmc tremc"
+command = "st -c sptrmc tremc"
 class = "sptremc"
 lazy = true
 size = "50% 50%"