Merge branch 'master' into cla

2 files changed, 16 insertions, 16 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index f51d989..1c07db0 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -109,7 +109,7 @@ misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
     enable_swallow = true
-    swallow_regex = ^(st-256color)$
+    swallow_regex = ^(kitty)$
     swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
     vfr = true
     vrr = 3
@@ -207,9 +207,9 @@ plugin {
 
 #{{{ Windowrules
 # Example windowrule v1
-# windowrule = float, ^(st)$
+# windowrule = float, ^(kitty)$
 # Example windowrule v2
-# windowrule = float, class:^(st)$, title:^(st)$
+# windowrule = float, class:^(kitty)$, title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 windowrulev2 = float, class:^(lxqt-policykit-agent)$
 windowrulev2 = tile, class:^(REAPER)$, title:^(REAPER v[0-9.]* - Registered to [A-Za-z ]* \(Licensed for personal/small business use\))$
@@ -396,14 +396,14 @@ bind = $mainMod $secdMod, P, exec, passmenu
 #}}}
 
 #{{{ Misc bindings
-bind = $mainMod, Return, exec, st
-bind = $mainMod $secdMod, F, exec, st lf
+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, Comma, exec, acpi-notify.sh
 #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1
 #}}}
 
diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf
index ce73d98..4274dcd 100644
--- a/hypr/hyprscratch.conf
+++ b/hypr/hyprscratch.conf
@@ -6,7 +6,7 @@ global_rules = size 50% 50%
 sphtop {
   # Mandatory fields
   title = sphtop
-  command = st -t sphtop htop
+  command = kitty -T sphtop htop
 
   # Optional fields
   options = lazy
@@ -16,7 +16,7 @@ sphtop {
 spterm {
   # Mandatory fields
   title = spterm
-  command = st -t spterm
+  command = kitty -T spterm
 
   # Optional fields
   options = lazy
@@ -26,7 +26,7 @@ spterm {
 sppmxr {
   # Mandatory fields
   title = sppmxr
-  command = st -t sppmxr pulsemixer
+  command = kitty -T sppmxr pulsemixer
 
   # Optional fields
   options = lazy
@@ -36,7 +36,7 @@ sppmxr {
 spblue {
   # Mandatory fields
   title = spblue
-  command = st -t spblue bluetoothctl
+  command = kitty -T spblue bluetoothctl
 
   # Optional fields
   options = lazy
@@ -46,7 +46,7 @@ spblue {
 spncmp {
   # Mandatory fields
   title = spncmp
-  command = st -t spncmp ncmpcpp
+  command = kitty -T spncmp ncmpcpp
 
   # Optional fields
   options = lazy
@@ -56,7 +56,7 @@ spncmp {
 spmutt {
   # Mandatory fields
   title = spmutt
-  command = st -t spmutt neomutt
+  command = kitty -T spmutt neomutt
 
   # Optional fields
   options = lazy
@@ -66,7 +66,7 @@ spmutt {
 spprof {
   # Mandatory fields
   title = spprof
-  command = st -t spprof profanity
+  command = kitty -T spprof profanity
 
   # Optional fields
   options = lazy
@@ -76,7 +76,7 @@ spprof {
 spirss {
   # Mandatory fields
   title = spirss
-  command = st -t spirss irssi
+  command = kitty -T spirss irssi
 
   # Optional fields
   options = lazy
@@ -86,7 +86,7 @@ spirss {
 sptodo {
   # Mandatory fields
   title = sptodo
-  command = st -t sptodo todo
+  command = kitty -T sptodo todo
 
   # Optional fields
   options = lazy
@@ -96,7 +96,7 @@ sptodo {
 sptrmc {
   # Mandatory fields
   title = sptrmc
-  command = st -t sptrmc tremc
+  command = kitty -T sptrmc tremc
 
   # Optional fields
   options = lazy