Merge branch 'master' into car

4 files changed, 47 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index cf80b9b..b0522b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,6 +290,7 @@ waybar/config-Hyprland-*
 waybar/config-river-*
 weechat/
 whoozle.github.io/
+winboat/
 wireshark/
 xmonad/.stack-work
 xmonad/stack.yaml.lock
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 211043e..b7052f3 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -9,8 +9,8 @@ monitor = , preferred, auto, 1
 # See https://wiki.hypr.land/Configuring/Keywords/ for more
 
 #{{{ Plugins
-plugin = /var/cache/hyprpm/zachir/hyprland-plugins/hyprscrolling.so
-plugin = /var/cache/hyprpm/zachir/hyprsplit/hyprsplit.so
+#plugin = /var/cache/hyprpm/zachir/hyprland-plugins/hyprscrolling.so
+#plugin = /var/cache/hyprpm/zachir/hyprsplit/hyprsplit.so
 #}}}
 
 #{{{ Autostart
@@ -33,6 +33,7 @@ exec-once = com.github.wwmm.easyeffects
 exec-once = systemctl --user start dunst
 exec-once = systemctl --user start hypridle
 exec-once = xwayland-satellite :1
+exec-once = bl-save
 #exec-once = mpd
 #}}}
 
@@ -149,7 +150,7 @@ decoration {
 
 #{{{ Animations options
 animations {
-    enabled = no
+    enabled = yes
     # Some default animations, see https://wiki.hypr.land/Configuring/Animations/ for more
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
     animation = windows, 1, 7, myBezier
@@ -237,7 +238,20 @@ windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\
 # Fix brave xray menus
 windowrulev2 = xray 0, class: ^(\s*), title: ^(\s*)$
 # Center floating XWayland windows
-windowrule = center, xwayland: 1
+#windowrule = center, xwayland: 1
+# Fix scratchpad window spawn behavior
+windowrule = workspace +0, onworkspace:name:special:sphtop, class:negative:sphtop
+windowrule = workspace +0, onworkspace:name:special:spterm, class:negative:spterm
+windowrule = workspace +0, onworkspace:name:special:sppmxr, class:negative:sppmxr
+windowrule = workspace +0, onworkspace:name:special:spblue, class:negative:spblue
+windowrule = workspace +0, onworkspace:name:special:spncmp, class:negative:spncmp
+windowrule = workspace +0, onworkspace:name:special:spmutt, class:negative:spmutt
+windowrule = workspace +0, onworkspace:name:special:spprof, class:negative:spprof
+windowrule = workspace +0, onworkspace:name:special:spirss, class:negative:spirss
+windowrule = workspace +0, onworkspace:name:special:spvimw, class:negative:spvimw
+windowrule = workspace +0, onworkspace:name:special:sptrmc, class:negative:sptrmc
+windowrule = workspace +0, onworkspace:name:special:helvum, class:negative:helvum
+windowrule = workspace +0, onworkspace:name:special:easyeffects, class:negative:easyeffects
 #}}}
 
 #{{{ Layerrules
diff --git a/niri/config.kdl b/niri/config.kdl
index 7a7f7ec..3fc9c5c 100644
--- a/niri/config.kdl
+++ b/niri/config.kdl
@@ -349,6 +349,30 @@ window-rule {
     clip-to-geometry true
 }
 
+// Setup workspaces
+//workspace "1"
+//workspace "2"
+//workspace "3"
+//workspace "4"
+//workspace "5"
+//workspace "6"
+//workspace "7"
+//workspace "8"
+//workspace "9"
+
+// Setup Scratchpads
+workspace "Scratchpad"
+
+window-rule {
+    match app-id=r#"^special-.*$"#
+    open-on-workspace "Scratchpad"
+    open-floating true
+    default-column-width { proportion 0.5; }
+    default-window-height { proportion 0.5; }
+}
+
+//spawn-at-startup "kitty -T spterm"
+
 binds {
     // Keys consist of modifiers separated by + signs, followed by an XKB key name
     // in the end. To find an XKB name for a particular key, you may use a program
@@ -609,4 +633,7 @@ binds {
 
     // Browsers
     Super+Alt+W { spawn "lwc"; }
+
+    // Scratchpads
+    Mod+Control+X { spawn "/usr/local/bin/spawn-or-focus.sh" "special-term"; }
 }
diff --git a/scroll/config b/scroll/config
index a7b97f6..0d71d5b 100644
--- a/scroll/config
+++ b/scroll/config
@@ -532,7 +532,7 @@ for_window [app_id="sphtop"] scratchpad show
 bindsym $mod+Ctrl+z lua $scripts/scratchpad.lua sphtop kitty htop
 for_window [app_id="spterm"] move scratchpad
 for_window [app_id="spterm"] scratchpad show
-bindsym $mod+Ctrl+x lua $scripts/scratchpad.lua spterm kitty
+bindsym $mod+Ctrl+x lua $scripts/scratchpad.lua spterm kitty zsh
 for_window [app_id="sppmxr"] move scratchpad
 for_window [app_id="sppmxr"] scratchpad show
 bindsym $mod+Ctrl+c lua $scripts/scratchpad.lua sppmxr kitty pulsemixer