From 91fdcfdbd26f4929bd1362eee8c5ea070e7fe5c4 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Tue, 17 Jan 2023 12:52:54 -0500
Subject: [PATCH] Re-assign workspaces for arrange.pl

---
 sway/autostart         |  9 ++++++---
 sway/behaviours        | 27 ++++++++++++++++++++++-----
 sway/bindings          |  2 +-
 waybar/config.template | 20 ++++++++++----------
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/sway/autostart b/sway/autostart
index cf8784dae..8575e63c9 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -41,8 +41,8 @@ exec pasystray &
 # 1:chat
 # TODO: Figure out Zith; normal weechat is a placeholder
 exec xterm -e /bin/bash -c "ssh -i ~/.ssh/no_pass jpm@john.me.tz -t 'screen -x weechat'" &
-exec flatpak run com.mattermost.Desktop &
-exec flatpak run chat.rocket.RocketChat &
+exec flatpak run com.mattermost.Desktop --socket=wayland --ozone-platform=wayland --enable-reatures=UseOzonePlatform &
+exec flatpak run chat.rocket.RocketChat --socket=wayland --ozone-platform=wayland --enable-reatures=UseOzonePlatform &
 
 # 2:mail - Should also prompt for keyring
 exec flatpak run org.mozilla.Thunderbird &
@@ -62,4 +62,7 @@ exec flatpak run org.mozilla.firefox &
 exec flatpak run com.github.Murmele.Gittyup &
 
 # 0:Hud
-exec flatpak run com.github.Eloston.UngoogledChromium --app="https://papillon.john.me.tz/hud.php?theme=dark&refresh=3600"
+exec flatpak run com.github.Eloston.UngoogledChromium --app="https://papillon.john.me.tz/hud.php?theme=dark&refresh=3600" --socket=wayland --ozone-platform=wayland --enable-reatures=UseOzonePlatform &
+
+# Assign workspaces to outputs
+exec $HOME/scripts/sway/arrange.pl &
diff --git a/sway/behaviours b/sway/behaviours
index 0bf16d215..b91abb518 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -4,18 +4,34 @@
 # Default workspaces
 ################################################################################
 
-assign [class="Mattermost"] 1
-assign [class="Rocket.Chat"] 1
+# ` - Grave
 assign [class="UXTerm"] grave
+# 0 - HUD
+assign [app_id="chrome-papillon.john.me.tz*"] 0 # Dedicated Chromium window for HUD
+# 1 - Chat
+assign [class="Mattermost"] 1
+assign [app_id="Mattermost"] 1
+assign [class="Rocket.Chat"] 1
+assign [app_id="Rocket.Chat"] 1
+# 2 - Mail
 assign [class="Thunderbird"] 2
 assign [class="thunderbird-default"] 2
 assign [app_id="thunderbird"] 2
+# 3 - Secondary Browser
 assign [class="Chromium"] 3
-assign [class="Linphone"] 5
+# 4 - Git
+assign [app_id="com.github.gittyup.Gittyup"] 4
+# 5 - Phone (TODO: pick something more useful)
+assign [class="linphone"] 5
+# 6 - Terminals (not auto-assigned since they are needed elsewhere)
+# 7 - Browser
 assign [class="firefox"] 7
 assign [app_id="firefox"] 7
-assign [app_id="com.github.gittyup.Gittyup"] 9
-assign [app_id="chrome-papillon.john.me.tz__-Default"] 0 # Dedicated Chromium window for HUD
+# 8 - IDE
+assign [app_id="neovide"] 8
+assign [app_id="code-oss-url-handler"] 8
+# 9 - Music
+assign [app_id="argos"] 9
 
 # Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar
 #assign [class="Vncviewer"] 9
@@ -24,6 +40,7 @@ assign [app_id="chrome-papillon.john.me.tz__-Default"] 0 # Dedicated Chromium wi
 # Floating windows
 ################################################################################
 
+for_window [app_id="org.gnome.Software"] floating enable # Gnome software doesn't get correct dimensions
 for_window [title="SSH Passphrase"] floating enable # SSH auth dialog
 for_window [title="^Picture-in-Picture$"] floating enable # Picture-in-picture firefox
 # Also make Picture-in-picture windows stick to active workspace
diff --git a/sway/bindings b/sway/bindings
index 211803178..85401e8ca 100644
--- a/sway/bindings
+++ b/sway/bindings
@@ -324,7 +324,7 @@ bindsym $mod+Shift+End exec $HOME/scripts/thinkpad/blc.pl --notify -= 10
 # Miscellaneous
 
 # Tab: Quick change. Shows all windows on all pages by name in wofi
-bindsym $mod+tab exec $HOME/scripts/wofi/alt-tab.py
+bindsym $mod+tab exec $HOME/scripts/sway/sway-alt-tab.sh
 
 # Resize Mode (you can also use the mouse for that): Entered with $mod+i
 mode "resize" {
diff --git a/waybar/config.template b/waybar/config.template
index ed00b389b..8603d5500 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -46,16 +46,16 @@
         "format": "{icon}",
         "numeric-first": true,
         "format-icons": {
-            "0": "0 \uf073",
-            "1": "1 \uf27a",
-            "2": "2 \uf0e0",
-            "3": "3 \uf268",
-            "4": "4 \uf144",
-            "5": "5 \uf095",
-            "6": "6 \uf120",
-            "7": "7 \uf269",
-            "8": "8 \uf121",
-            "9": "9 \uf126",
+            "0": "0 \uf073", // HUD
+            "1": "1 \uf27a", // Chat
+            "2": "2 \uf0e0", // Mail
+            "3": "3 \uf268", // Secondary Browser
+            "4": "4 \uf126", // Git
+            "5": "5 \uf095", // TBD
+            "6": "6 \uf120", // Terminals
+            "7": "7 \uf269", // Browser
+            "8": "8 \uf121", // IDE
+            "9": "9 \uf144", // Music
             "C0": "C0",
             "C1": "C1",
             "C2": "C2",