Merge branch 'master' into car

3 files changed, 51 insertions, 26 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index de47dab..207e300 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -243,18 +243,42 @@ windowrule = center on, match:xwayland on, match:class negative:^(steam|REAPER)$
 # Make Steam Big Picture Mode fullscreen
 windowrule = fullscreen on, match:class ^(steam)$, match:title ^(Steam Big Picture Mode)$
 # Fix scratchpad window spawn behavior
-windowrule = workspace +0, match:workspace name:sphtop, match:class negative:sphtop
-windowrule = workspace +0, match:workspace name:spterm, match:class negative:spterm
-windowrule = workspace +0, match:workspace name:sppmxr, match:class negative:sppmxr
-windowrule = workspace +0, match:workspace name:spblue, match:class negative:spblue
-windowrule = workspace +0, match:workspace name:spncmp, match:class negative:spncmp
-windowrule = workspace +0, match:workspace name:spmutt, match:class negative:spmutt
-windowrule = workspace +0, match:workspace name:spprof, match:class negative:spprof
-windowrule = workspace +0, match:workspace name:spirss, match:class negative:spirss
-windowrule = workspace +0, match:workspace name:spvimw, match:class negative:spvimw
-windowrule = workspace +0, match:workspace name:sptrmc, match:class negative:sptrmc
-windowrule = workspace +0, match:workspace name:helvum, match:class negative:helvum
-windowrule = workspace +0, match:workspace name:easyeffects, match:class negative:easyeffects
+windowrule = workspace +0, match:workspace name:sphtop, match:title negative:sphtop
+windowrule = workspace +0, match:workspace name:spterm, match:title negative:spterm
+windowrule = workspace +0, match:workspace name:sppmxr, match:title negative:sppmxr
+windowrule = workspace +0, match:workspace name:spblue, match:title negative:spblue
+windowrule = workspace +0, match:workspace name:spncmp, match:title negative:spncmp
+windowrule = workspace +0, match:workspace name:spmutt, match:title negative:spmutt
+windowrule = workspace +0, match:workspace name:spprof, match:title negative:spprof
+windowrule = workspace +0, match:workspace name:spirss, match:title negative:spirss
+windowrule = workspace +0, match:workspace name:spvimw, match:title negative:spvimw
+windowrule = workspace +0, match:workspace name:sptrmc, match:title negative:sptrmc
+windowrule = workspace +0, match:workspace name:helvum, match:title negative:helvum
+windowrule = workspace +0, match:workspace name:easyeffects, match:title negative:easyeffects
+windowrule = center on, match:title sphtop
+windowrule = center on, match:title spterm
+windowrule = center on, match:title sppmxr
+windowrule = center on, match:title spblue
+windowrule = center on, match:title spncmp
+windowrule = center on, match:title spmutt
+windowrule = center on, match:title spprof
+windowrule = center on, match:title spirss
+windowrule = center on, match:title spvimw
+windowrule = center on, match:title sptrmc
+windowrule = center on, match:title helvum
+windowrule = center on, match:title easyeffects
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(sphtop)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spterm)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(sppmxr)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spblue)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spncmp)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spmutt)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spprof)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spirss)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(spvimw)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(sptrmc)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(helvum)$
+windowrule = size monitor_w/2 monitor_h/2, match:title ^(easyeffects)$
 #}}}
 
 #{{{ Layerrules
@@ -456,6 +480,18 @@ bind = $mainMod Control, M, exec, volsv -m
 #}}}
 
 #{{{ Scratchpads
+workspace = name:sphtop, persistent:false
+workspace = name:spterm, persistent:false
+workspace = name:sppmxr, persistent:false
+workspace = name:spblue, persistent:false
+workspace = name:spncmp, persistent:false
+workspace = name:spmutt, persistent:false
+workspace = name:spprof, persistent:false
+workspace = name:spirss, persistent:false
+workspace = name:spvimw, persistent:false
+workspace = name:sptrmc, persistent:false
+workspace = name:helvum, persistent:false
+workspace = name:easyeffects, persistent:false
 bind = $mainMod CONTROL, Z, exec, hyprscratch toggle sphtop
 bind = $mainMod CONTROL, X, exec, hyprscratch toggle spterm
 bind = $mainMod CONTROL, C, exec, hyprscratch toggle sppmxr
diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf
index 5964419..fe3cda6 100644
--- a/hypr/hyprscratch.conf
+++ b/hypr/hyprscratch.conf
@@ -1,8 +1,8 @@
 # Optional globals that apply to all scratchpads
 daemon_options = clean
-daemon_options = eager
+daemon_options = spotless
 
-global_rules = size 50% 50%
+global_options = special
 
 sphtop {
   # Mandatory fields
@@ -11,7 +11,6 @@ sphtop {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spterm {
@@ -21,7 +20,6 @@ spterm {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 sppmxr {
@@ -31,7 +29,6 @@ sppmxr {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spblue {
@@ -41,7 +38,6 @@ spblue {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spncmp {
@@ -51,7 +47,6 @@ spncmp {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spmutt {
@@ -61,7 +56,6 @@ spmutt {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spprof {
@@ -71,7 +65,6 @@ spprof {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spirss {
@@ -81,7 +74,6 @@ spirss {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 spvimw {
@@ -91,7 +83,6 @@ spvimw {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 sptrmc {
@@ -101,7 +92,6 @@ sptrmc {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 helvum {
@@ -111,7 +101,6 @@ helvum {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
 easyeffects {
@@ -121,6 +110,5 @@ easyeffects {
 
   # Optional fields
   options = lazy
-  options = special
 }
 
diff --git a/waybar/config b/waybar/config
index 93cbcf1..8ca6666 100644
--- a/waybar/config
+++ b/waybar/config
@@ -72,6 +72,7 @@
       "active-only": false,
       "all-outputs": false,
       "persistent-only": true,
+      "show-special": false,
       "format-icons": {
         "1": "1",
         "2": "2",