From a897858a9c384af405fd527e347e6571dbdf2e2e Mon Sep 17 00:00:00 2001
From: Massaki Archambault <badjware@massaki.ca>
Date: Tue, 17 Sep 2019 19:31:13 -0400
Subject: [PATCH] some waybar fixes

---
 files/.config/sway/config   | 34 ++++++++++++++++++----------------
 files/.config/waybar/config |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/files/.config/sway/config b/files/.config/sway/config
index 88c1f40..e3ab15e 100644
--- a/files/.config/sway/config
+++ b/files/.config/sway/config
@@ -19,19 +19,19 @@ client.background       $bg
 # is used in the bar {} block below.
 font pango:sans 8
 
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
+set $ws1 1
+set $ws2 2
+set $ws3 3
+set $ws4 4
+set $ws5 5
+set $ws6 6
+set $ws7 7
+set $ws8 8
+set $ws9 9
+set $ws10 10
 
 # default workspace
-workspace "2"
+workspace $ws2
 
 # window title
 #for_window [class="^.*"] border pixel 2 title_format " %title"
@@ -72,9 +72,11 @@ for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable
 for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
 for_window [title="^Steam Keyboard$"] floating enable
 
-## Application assignement
-assign [class="[Ss]lack"] 1
-assign [class="[Dd]iscord"] 1
+# https://github.com/Alexays/Waybar/issues/63
+for_window [app_id="waybar" floating] {
+    move position cursor
+    move down 120px # adjust if some menus still don't fit
+}
 
 ### Output configuration
 output "*" {
@@ -234,8 +236,8 @@ bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws10
 
 # Assignation
-assign [class="^Slack$"] $ws1
-assign [class="^discord$"] $ws1
+assign [class="^[Ss]lack$"] $ws1
+assign [class="^[Dd]iscord$"] $ws1
 assign [class="^looking-glass-client$"] $ws3
 
 # screen
diff --git a/files/.config/waybar/config b/files/.config/waybar/config
index 50692bc..8f69d96 100644
--- a/files/.config/waybar/config
+++ b/files/.config/waybar/config
@@ -10,7 +10,7 @@
     // Modules configuration
     "sway/workspaces": {
          "disable-scroll": true,
-         "all-outputs": true,
+         "all-outputs": false,
          "format": "{name}"
     },
     "sway/mode": {