2 files changed, 20 insertions, 17 deletions
diff --git a/home-manager/polybar/config.ini b/home-manager/polybar/config.ini
index ada0268..b7cf83e 100644
--- a/home-manager/polybar/config.ini
+++ b/home-manager/polybar/config.ini
@@ -27,7 +27,7 @@ disabled = #515772
 active = #eeffff
 inactive = #515772
 
-[bar/status]
+[section/bar-defaults]
 width = 100%
 height = 19pt
 radius = 10
@@ -55,29 +55,34 @@ separator-foreground = ${colors.disabled}
 
 font-0 = Cousine Nerd Font;1
 
-modules-left = xworkspaces
-modules-right = pipewire xkeyboard memory cpu battery date tray
-; modules-center = xwindow
-
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; For center tray - also make sure to change the launch.sh
-tray-position = ${env:TRAY:}
-
 ; wm-restack = generic
 ; wm-restack = bspwm
 wm-restack = generic
 
 override-redirect = false
 
+[bar/mainbar]
+inherit = section/bar-defaults
+modules-left = xworkspaces
+modules-right = pipewire xkeyboard memory cpu battery date tray
+modules-center = xwindow
+
+[bar/extrabar]
+inherit = section/bar-defaults
+modules-left = xworkspaces
+modules-right = pipewire xkeyboard memory cpu battery date
+modules-center = xwindow
 
 [module/xworkspaces]
-pin-workspaces = true
 type = internal/xworkspaces
 
+pin-workspaces = true
+
 label-active = %name%
 label-active-foreground = ${colors.active}
 label-active-padding = 1
@@ -91,7 +96,7 @@ label-urgent-foreground = ${colors.inactive}
 label-urgent-background = ${colors.alert}
 label-urgent-padding = 1
 
-label-empty = 
+label-empty =
 label-empty-foreground = ${colors.inactive}
 label-empty-padding = 0
 
@@ -158,11 +163,9 @@ date-alt = %H:%M:%S %d-%m-%Y
 label = %date%
 label-foreground = ${colors.primary}
 
-; Using polybar-git instead
-; [module/tray]
-; type = internal/tray
-; format = ${env:TRAY:}
-; tray-spacing = 5
+[module/tray]
+type = internal/tray
+tray-spacing = 5
 
 [module/xwindow]
 type = internal/xwindow
diff --git a/home-manager/polybar/launch.sh b/home-manager/polybar/launch.sh
index 00514be..41d5f3d 100755
--- a/home-manager/polybar/launch.sh
+++ b/home-manager/polybar/launch.sh
@@ -11,9 +11,9 @@ echo "---" | tee -a /tmp/polybarstatus.log
 
 for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     if [ $(xrandr | grep $m | grep primary | wc -l) -eq 1 ]; then
-        MONITOR=$m TRAY="center" polybar status | tee -a /tmp/polybarstatus.log & disown
+        MONITOR=$m polybar mainbar | tee -a /tmp/mainpolybar.log & disown
     else
-        MONITOR=$m TRAY="" polybar status | tee -a /tmp/polybarstatus.log & disown
+        MONITOR=$m polybar extrabar | tee -a /tmp/extrapolybar.log & disown
     fi
 done