Merge branch 'master' into car

4 files changed, 143 insertions, 177 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 80848af..a1ede5e 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -14,6 +14,7 @@ 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-Solid'
 exec-once = import-gsettings icon-theme 'COSMIC'
@@ -260,10 +261,10 @@ bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING
 bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING
 bind = $mainMod+SHIFT, J, layoutmsg, colresize -conf #HYPRSCROLLING
 bind = $mainMod+SHIFT, K, layoutmsg, colresize +conf #HYPRSCROLLING
-bind = $mainMod, H, movefocus, l #HYPRSCROLLING
-bind = $mainMod, J, movefocus, u #HYPRSCROLLING
-bind = $mainMod, K, movefocus, d #HYPRSCROLLING
-bind = $mainMod, L, movefocus, r #HYPRSCROLLING
+bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING
+bind = $mainMod, J, layoutmsg, focus u #HYPRSCROLLING
+bind = $mainMod, K, layoutmsg, focus d #HYPRSCROLLING
+bind = $mainMod, L, layoutmsg, focus r #HYPRSCROLLING
 bind = $mainMod+SHIFT, Return, layoutmsg, promote #HYPRSCROLLING
 #}}}
 
@@ -413,80 +414,18 @@ bind = $mainMod, Comma, exec, acpi-notify.sh
 #}}}
 
 #{{{ Scratchpads
-bind = $mainMod CONTROL, Z, exec, pypr toggle sphtop
-$sphtop = class:^(sphtop)$
-windowrule = float,$sphtop
-windowrule = workspace special:sphtop silent,$sphtop
-windowrule = size 50% 50%,$sphtop
-windowrule = move 25% 25%,$sphtop
-bind = $mainMod CONTROL, X, exec, pypr toggle spterm
-$spterm = class:^(spterm)$
-windowrule = float,$spterm
-windowrule = workspace special:spterm silent,$spterm
-windowrule = size 50% 50%,$spterm
-windowrule = move 25% 25%,$spterm
-bind = $mainMod CONTROL, C, exec, pypr toggle sppmxr
-$sppmxr = class:^(sppmxr)$
-windowrule = float,$sppmxr
-windowrule = workspace special:sppmxr silent,$sppmxr
-windowrule = size 50% 50%,$sppmxr
-windowrule = move 25% 25%,$sppmxr
-bind = $mainMod CONTROL, V, exec, pypr toggle spblue
-$spblue = class:^(spblue)$
-windowrule = float,$spblue
-windowrule = workspace special:spblue silent,$spblue
-windowrule = size 50% 50%,$spblue
-windowrule = move 25% 25%,$spblue
-bind = $mainMod CONTROL, B, exec, pypr toggle spncmp
-$spncmp = class:^(spncmp)$
-windowrule = float,$spncmp
-windowrule = workspace special:spncmp silent,$spncmp
-windowrule = size 50% 50%,$spncmp
-windowrule = move 25% 25%,$spncmp
-bind = $mainMod CONTROL, A, exec, pypr toggle spmutt
-$spmutt = class:^(spmutt)$
-windowrule = float,$spmutt
-windowrule = workspace special:spmutt silent,$spmutt
-windowrule = size 50% 50%,$spmutt
-windowrule = move 25% 25%,$spmutt
-bind = $mainMod CONTROL, S, exec, pypr toggle spprof
-$spprof = class:^(spprof)$
-windowrule = float,$spprof
-windowrule = workspace special:spprof silent,$spprof
-windowrule = size 50% 50%,$spprof
-windowrule = move 25% 25%,$spprof
-bind = $mainMod CONTROL, D, exec, pypr toggle spirss
-$spirss = class:^(spirss)$
-windowrule = float,$spirss
-windowrule = workspace special:spirss silent,$spirss
-windowrule = size 50% 50%,$spirss
-windowrule = move 25% 25%,$spirss
-bind = $mainMod CONTROL, F, exec, pypr toggle sptodo
-$sptodo = class:^(sptodo)$
-windowrule = float,$sptodo
-windowrule = workspace special:sptodo silent,$sptodo
-windowrule = size 50% 50%,$sptodo
-windowrule = move 25% 25%,$sptodo
-bind = $mainMod CONTROL, G, exec, pypr toggle sptrmc
-$sptrmc = class:^(sptrmc)$
-windowrule = float,$sptrmc
-windowrule = workspace special:sptrmc silent,$sptrmc
-windowrule = size 50% 50%,$sptrmc
-windowrule = move 25% 25%,$sptrmc
-
-bind = $mainMod CONTROL, Q, exec, pypr toggle qpwgraph
-$spqpwg = class:^(org\.rncbc\.qpwgraph)$
-windowrule = float,$spqpwg
-windowrule = workspace special:spqpwg silent,$spqpwg
-windowrule = size 50% 50%,$spqpwg
-windowrule = move 25% 25%,$spqpwg
-
-bind = $mainMod CONTROL, E, togglespecialworkspace, speasy
-$speasy = class:^(com\.github\.wwmm\.easyeffects)$
-windowrule = float,$speasy
-windowrule = workspace special:speasy silent,$speasy
-windowrule = size 50% 50%,$speasy
-windowrule = move 25% 25%,$speasy
+bind = $mainMod CONTROL, Z, exec, hyprscratch toggle sphtop
+bind = $mainMod CONTROL, X, exec, hyprscratch toggle spterm
+bind = $mainMod CONTROL, C, exec, hyprscratch toggle sppmxr
+bind = $mainMod CONTROL, V, exec, hyprscratch toggle spblue
+bind = $mainMod CONTROL, B, exec, hyprscratch toggle spncmp
+bind = $mainMod CONTROL, A, exec, hyprscratch toggle spmutt
+bind = $mainMod CONTROL, S, exec, hyprscratch toggle spprof
+bind = $mainMod CONTROL, D, exec, hyprscratch toggle spirss
+bind = $mainMod CONTROL, F, exec, hyprscratch toggle sptodo
+bind = $mainMod CONTROL, G, exec, hyprscratch toggle sptrmc
+bind = $mainMod CONTROL, Q, exec, hyprscratch toggle helvum
+bind = $mainMod CONTROL, E, exec, hyprscratch toggle easyeffects
 #}}}
 
 #{{{ OBS bindings
diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf
new file mode 100644
index 0000000..ce73d98
--- /dev/null
+++ b/hypr/hyprscratch.conf
@@ -0,0 +1,125 @@
+# Optional globals that apply to all scratchpads
+daemon_options = clean
+
+global_rules = size 50% 50%
+
+sphtop {
+  # Mandatory fields
+  title = sphtop
+  command = st -t sphtop htop
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spterm {
+  # Mandatory fields
+  title = spterm
+  command = st -t spterm
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+sppmxr {
+  # Mandatory fields
+  title = sppmxr
+  command = st -t sppmxr pulsemixer
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spblue {
+  # Mandatory fields
+  title = spblue
+  command = st -t spblue bluetoothctl
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spncmp {
+  # Mandatory fields
+  title = spncmp
+  command = st -t spncmp ncmpcpp
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spmutt {
+  # Mandatory fields
+  title = spmutt
+  command = st -t spmutt neomutt
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spprof {
+  # Mandatory fields
+  title = spprof
+  command = st -t spprof profanity
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+spirss {
+  # Mandatory fields
+  title = spirss
+  command = st -t spirss irssi
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+sptodo {
+  # Mandatory fields
+  title = sptodo
+  command = st -t sptodo todo
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+sptrmc {
+  # Mandatory fields
+  title = sptrmc
+  command = st -t sptrmc tremc
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+helvum {
+  # Mandatory fields
+  title = Helvum - Pipewire Patchbay
+  command = helvum
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
+easyeffects {
+  # Mandatory fields
+  title = Easy Effects
+  command = easyeffects
+
+  # Optional fields
+  options = lazy
+  options = special
+}
+
diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml
index 5c1d343..cacd7f1 100644
--- a/hypr/pyprland.toml
+++ b/hypr/pyprland.toml
@@ -1,103 +1,5 @@
 [pyprland]
 plugins = [
-  "scratchpads",
   "toggle_special",
   "expose"
 ]
-
-[scratchpads.sphtop]
-animation = ""
-command = "st -c sphtop htop"
-class = "sphtop"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spterm]
-animation = ""
-command = "st -c spterm"
-class = "spterm"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.sppmxr]
-animation = ""
-command = "st -c sppmxr pulsemixer"
-class = "sppmxr"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spblue]
-animation = ""
-command = "st -c spblue bluetoothctl"
-class = "spblue"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spncmp]
-animation = ""
-command = "st -c spncmp ncmpcpp"
-class = "spncmp"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spmutt]
-animation = ""
-command = "st -c spmutt neomutt"
-class = "spmutt"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spprof]
-animation = ""
-command = "st -c spprof profanity"
-class = "spprof"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.spirss]
-animation = ""
-command = "st -c spirss irssi"
-class = "spirss"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.sptodo]
-animation = ""
-command = "st -c sptodo todo"
-class = "sptodo"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.sptrmc]
-animation = ""
-command = "st -c sptrmc tremc"
-class = "sptremc"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.helvum]
-animation = ""
-command = "helvum"
-class = "org.pipewire.Helvum"
-lazy = true
-size = "50% 50%"
-position = "25% 25%"
-
-[scratchpads.easyeffects]
-animation = ""
-command = "flatpak run com.github.wwmm.easyeffects"
-class = "com.github.wwmm.easyeffects"
-lazy = true
-size = "75% 75%"
-position = "25% 25%"
-unfocus = "hide"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a96f1c1..b70b3d4 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -56,7 +56,7 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 export KEYTIMEOUT=1
 
-#fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+fpath+="$XDG_CONFIG_HOME/zsh/functions"
 
 autoload -Uz compinit 
 if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then