1 files changed, 62 insertions, 60 deletions
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 4628468..050b0a5 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -64,13 +64,6 @@ modules-left =
 modules-center =
 modules-right =
 
-tray-position = right
-tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-tray-scale = 1
-tray-detached = false
-
 ;wm-restack = bspwm
 ;wm-restack = i3
 
@@ -88,17 +81,14 @@ double-click-right =
 cursor-click = pointer
 cursor-scroll = ns-resize
 
-[bar/topbar-i3]
+[bar/topbar-base]
 inherit = bar/base
 
-wm-restack = i3
-override-redirect = false
-
 click-left =
 click-middle =
 click-right =
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
+scroll-up =
+scroll-down =
 double-click-left =
 double-click-middle =
 double-click-right =
@@ -106,53 +96,53 @@ double-click-right =
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+tray-position = right
+tray-padding = 2
+;tray-transparent = true
+;tray-background = #0063ff
+tray-scale = 1
+tray-detached = false
+
+
 modules-left = hostname xwindow
 modules-center =
 modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth ethvpn battery temperature
 
+[bar/topbar-i3]
+inherit = bar/topbar-base
+
+wm-restack = i3
+override-redirect = false
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+
 [bar/topbar-bspwm]
-inherit = bar/base
+inherit = bar/topbar-base
 
 wm-restack = bspwm
 override-redirect = false
-
-click-left =
-click-middle =
-click-right =
 scroll-up = bspwm-desknext
 scroll-down = bspwm-deskprev
-double-click-left =
-double-click-middle =
-double-click-right =
 
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-modules-left = hostname xwindow
-modules-center =
-modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth ethvpn battery temperature
-
-[bar/topbar-herbstluftwm]
-inherit = bar/base
+[bar/topbar-hlwm]
+inherit = bar/topbar-base
+offset-y = ${env:OFFSET_Y:0}
 
 scroll-up = herbstclient use_index +1
 scroll-down = herbstclient use_index -1
-modules-left = hostname xwindow
-modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth ethvpn battery temperature
 
-[bar/topbar2-i3]
+[bar/topbar2-base]
 inherit = bar/base
 offset-y = 0
 fixed-center = true
 
-wm-restack = i3
 override-redirect = false
 
 click-left =
 click-middle =
 click-right =
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
+scroll-up =
+scroll-down =
 double-click-left =
 double-click-middle =
 double-click-right =
@@ -160,40 +150,50 @@ double-click-right =
 cursor-click = pointer
 cursor-scroll = ns-resize
 
-modules-left = i3
+modules-left =
 modules-center = spotify
 modules-right = date
 
+[bar/topbar2-i3]
+inherit = bar/topbar2-base
+
+wm-restack = i3
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+modules-left = i3
+
 [bar/topbar2-bspwm]
-inherit = bar/base
+inherit = bar/topbar2-base
 offset-y = 40
-fixed-center = true
+override-redirect = false
 
 wm-restack = bspwm
-override-redirect = false
 
-click-left =
-click-middle =
-click-right =
 scroll-up = bspwm-desknext
 scroll-down = bspwm-deskprev
-double-click-left =
-double-click-middle =
-double-click-right =
-
-cursor-click = pointer
-cursor-scroll = ns-resize
 
 modules-left = bspwm
-modules-center = spotify
-modules-right = date
+
+[bar/topbar2-hlwm]
+inherit = bar/topbar2-base
+offset-y = ${env:OFFSET_Y:40}
+override-redirect = false
+
+scroll-up = herbstclient use_index +1
+scroll-down = herbstclient use_index -1
+
+modules-left = hlwm
 
 ;=============================================================================
 ; modules
 ;=============================================================================
 
-[module/herbstluftwm]
+[module/hlwm]
 type = custom/script
+exec = ~/.local/bin/statusbar/polybar_hlwm_workspaces.sh
+tail = true
+scroll-up = herbstclient use_index -1 --skip-visible &
+scroll-down = herbstclient use_index +1 --skip-visible &
 
 [module/hostname]
 type = custom/script
@@ -212,11 +212,11 @@ tail = true
 format = <label>
 format-foreground = ${colors.foreground-alt}
 format-underline = ${colors.primary}
-click-right = playerctl play-pause
-click-left = playerctl play-pause
-click-middle = playerctl next
-scroll-up = playerctl next
-scroll-down = playerctl previous
+click-right = playerctl --player=spotify play-pause
+click-left = playerctl --player=spotify play-pause
+click-middle = playerctl --player=spotify next
+scroll-up = playerctl --player=spotify next
+scroll-down = playerctl --player=spotify previous
 label-maxlen = 120
 label-ellipsis = true
 
@@ -393,7 +393,8 @@ interval = 2
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground}
 format-underline = #4bffdc
-label = %percentage_used%%
+label = %percentage_used%% free: %mb_free% (swap: %mb_swap_used%)
+;label = %percentage_used%% swap: %mb_swap_used%
 
 [module/wlan]
 type = internal/network
@@ -404,7 +405,8 @@ accumulate-stats = true
 format-connected-prefix = " "
 format-connected = <label-connected>
 format-connected-underline = #9f78e1
-label-connected = %essid% %local_ip% ↓%downspeed% ↑%upspeed% (%signal%)
+label-connected = %local_ip% ↓%downspeed% ↑%upspeed% (%signal%)
+;label-connected = %essid% %local_ip% ↓%downspeed% ↑%upspeed% (%signal%)
 
 format-disconnected =
 ;format-disconnected = <label-disconnected>
@@ -527,7 +529,7 @@ type = internal/battery
 time-format = %H:%M
 battery = BAT0
 adapter = AC
-full-at = 89
+full-at = 95
 
 format-charging = <animation-charging> <label-charging>
 format-charging-underline = #ffb52a