sway: refactor auto.conf

2 files changed, 34 insertions, 49 deletions

diff --git a/.config/sway/auto.conf b/.config/sway/auto.conf
index 8eae9f1..755095d 100644
--- a/.config/sway/auto.conf
+++ b/.config/sway/auto.conf
@@ -2,64 +2,47 @@
 # NOTE: never use assign, it crashes sway for some reason...
 
 # for_window [floating] border csd
-
-for_window [app_id="mpv"] max_render_time off
-
-for_window [app_id="mpv"] floating enable; inhibit_idle fullscreen
-# for_window [app_id="mpv" title=".* - mvi$"] border pixel $bpix;
-
-for_window [app_id="imv"] floating enable; inhibit_idle open
+for_window [app_id="[tT]elegram[-_][dD]esktop"] mark mail
+for_window [app_id="[tT]elegram[-_][dD]esktop" title="Choose Files"] floating enable; exec centercon -w .6
+for_window [app_id="[tT]elegram[-_][dD]esktop" title="Media viewer"] floating enable
+for_window [app_id="[tT]elegram[-_][dD]esktop" title="TelegramDesktop"] floating enable
 for_window [app_id="^__floating-.*"] floating enable
-for_window [class="pinentry"] floating enable; border normal
-
-# for_window [class="zoom" title="Settings"] floating enable
-# for_window [class="zoom" title="Zoom - Converting.*"] floating enable
-for_window [app_id="zoom"] floating enable
-
-for_window [title="tridactyledit"] floating enable
-for_window [app_id="launcher"] floating enable
-for_window [class="balena-etcher-electron"] floating enable; border normal
 for_window [app_id="com.github.wwmm.easyeffects"] floating enable; border none; exec centercon -w .4
-
-for_window [app_id="firefox.*" title="Picture-in-Picture"] floating enable, sticky enable, border none
-# for_window [app_id="firefox.*" title="^Developer Tools"] floating enable
-for_window [app_id="firefox.*" title="Sharing Indicator$"] floating enable, border none, sticky enable; exec centercon 1 tr; focus mode_toggle
-for_window [app_id="firefox.*" title="^Close tabs?"] floating enable
-for_window [app_id="firefox.*" title="^File Upload$"] floating enable
-# exec centercon -w .6
-for_window [app_id="firefox.*" title="^Save As$"] floating enable
-# exec centercon -w .6
-for_window [app_id="firefox.*" title="^Open Firefox in Troubleshoot Mode?$"] floating enable
-for_window [app_id="firefox.*" title="^About Mozilla Firefox$"] floating enable
-for_window [app_id="multimc" title="Folder$"] floating enable
-
-for_window [app_id="telegram-desktop"] mark mail
-for_window [app_id="telegram-desktop" title="Choose Files"] floating enable; exec centercon -w .6
-for_window [app_id="telegram-desktop" title="Media viewer"] floating enable
-for_window [app_id="telegram-desktop" title="TelegramDesktop"] floating enable
-#for_window [app_id="telegram-desktop" floating] exec centercon -w .6
-
+for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable, border none
+for_window [app_id="firefox" title="Sharing Indicator$"] floating enable, border none, sticky enable; exec centercon 1 tr; focus mode_toggle
+for_window [app_id="firefox" title="^About Mozilla Firefox$"] floating enable
+for_window [app_id="firefox" title="^Close tabs?"] floating enable
+# for_window [app_id="firefox" title="^Developer Tools"] floating enable
+for_window [app_id="firefox" title="^Extension: (Yomichan)"] floating enable
+for_window [app_id="firefox" title="^File Upload$"] floating enable
+for_window [app_id="firefox" title="^Open Firefox in Troubleshoot Mode?$"] floating enable
+for_window [app_id="firefox" title="^Save As$"] floating enable
+for_window [app_id="firefox"] mark browser
+for_window [app_id="imv"] floating enable; inhibit_idle open
+for_window [app_id="launcher"] floating enable
+for_window [app_id="mpv"] floating enable; inhibit_idle fullscreen
+for_window [app_id="mpv"] max_render_time off
+# for_window [app_id="mpv" title=".* - mvi$"] border pixel $bpix;
 for_window [app_id="obs" title="^Local File$"] floating enable; exec centercon -w .6
-
-# Tag windows
-for_window [app_id="firefox.*"] mark browser
-for_window [class="Chromium-browser"] mark work; mark browser
+for_window [app_id="org.polymc.PolyMC" title="$Console"] floating enable
+for_window [app_id="slack"] mark mail
+for_window [app_id="zoom" title="Settings"] floating enable
+for_window [class="Chromium-browser"] mark browser
+for_window [class="Slack"] mark mail
+for_window [app_id="" title="^Slack"] mark mail
+for_window [class="balena-etcher-electron"] floating enable; border normal
 for_window [class="discord"] mark mail
-
 for_window [class="parsecd"] inhibit_idle fullscreen
+for_window [class="pinentry"] floating enable; border normal
 for_window [con_mark="browser"] inhibit_idle fullscreen
-
-# Move around
+for_window [title="tridactyledit"] floating enable
 
 set $outputSide eDP-1
-for_window [con_mark="work"] move workspace 3
-for_window [con_mark="mail"] move workspace 2, move workspace to output $outputSide, layout tabbed
-
+for_window [con_mark="work"] move workspace $wsWork
+for_window [con_mark="mail"] move workspace $wsMail, move workspace to output $outputSide, layout tabbed
 for_window [class="Spotify"] move workspace $wsMusic, move workspace to output $outputSide
 for_window [class="osu!"] move workspace $wsGame, layout tabbed, exec osu-mode on
-
 for_window [app_id="org.keepassxc.KeePassXC"] move scratchpad; scratchpad show
 for_window [class="Gvncviewer"] move workspace __vnc; fullscreen
-
-for_window [app_id="retroarch"] fullscreen; seat * hide_cursor 1000
-for_window [app_id=".*"] seat * hide_cursor 0
+for_window [app_id="retroarch"] fullscreen
+for_window [class="^Minecraft"] fullscreen; sway output - scale 1
diff --git a/.config/sway/config b/.config/sway/config
index 8023e13..ab1f6e7 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -38,6 +38,8 @@ set $ws0 0
 set $wsMusic m
 set $wsVideo v
 set $wsGame g
+set $wsMail 2
+set $wsWork 3
 # }}}
 
 # gaps inner 5