reorganization and updates

2 files changed, 49 insertions, 46 deletions

diff --git a/i3wm/.config/polybar/config b/i3wm/.config/polybar/config
index 21b5a30..74c9e85 100644
--- a/i3wm/.config/polybar/config
+++ b/i3wm/.config/polybar/config
@@ -34,7 +34,7 @@ height = 30
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 6.0
-fixed-center = true
+fixed-center = false
 
 background = ${colors.background}
 foreground = ${colors.foreground}
@@ -46,12 +46,9 @@ border-size = 10
 border-bottom-size = 0
 border-color = #00000000
 
-padding-left = 0
+padding-left = 2
 padding-right = 2
 
-module-margin-left = 1
-module-margin-right = 2
-
 font-0 = fixed:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
@@ -59,30 +56,26 @@ font-3 = "Font Awesome 5 Brands:style=Regular:pixelsize=8;1"
 font-4 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
 font-5 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
 
-modules-left = hostname xwindow
-modules-center = spotify
-modules-right = taskwarrior
-
 tray-position = right
 tray-padding = 2
 ;tray-transparent = true
 ;tray-background = #0063ff
 tray-scale = 1
+tray-detached = false
 
-;wm-restack = bspwm
 wm-restack = i3
-
 override-redirect = false
 
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev
-
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+module-margin-left = 2
+module-margin-right = 2
+modules-left = hostname xwindow
+modules-center =
+modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth battery temperature
 
 [bar/topbar-second]
 monitor = ${env:MONITOR:eDP-1}
@@ -90,7 +83,7 @@ width = 100%
 height = 30
 ;offset-x = 1%
 ;offset-y = 0
-;radius = 1.0
+radius = 6.0
 fixed-center = true
 
 background = ${colors.background}
@@ -107,9 +100,6 @@ border-color = #00000000
 padding-left = 2
 padding-right = 2
 
-module-margin-left = 1
-module-margin-right = 2
-
 font-0 = fixed:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
@@ -117,20 +107,20 @@ font-3 = "Font Awesome 5 Brands:style=Regular:pixelsize=8;1"
 font-4 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
 font-5 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
 
-modules-left = i3
-modules-center =
-modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth battery temperature date
-
 wm-restack = i3
-
 override-redirect = false
 
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev
-
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+module-margin-left = 2
+module-margin-right = 2
+modules-left = i3
+modules-center = spotify
+modules-right = taskwarrior date
+
 [module/hostname]
 type = custom/script
 interval = 256
@@ -153,7 +143,7 @@ click-left = xte 'key XF86AudioPlay'
 click-middle = xte 'key XF86AudioNext'
 scroll-up = xte 'key XF86AudioNext'
 scroll-down = xte 'key XF86AudioPrev'
-label-maxlen = 30
+label-maxlen = 120
 label-ellipsis = true
 
 [module/xwindow]
@@ -211,36 +201,36 @@ label-empty-padding = 2
 
 [module/i3]
 type = internal/i3
+; Only show workspaces on the same output as the bar
+pin-workspaces = true
+strip-wsnumbers = true
 format = <label-state> <label-mode>
 index-sort = true
 wrapping-scroll = false
 
-; Only show workspaces on the same output as the bar
-;pin-workspaces = true
-
 label-mode = %mode%
 label-mode-padding = 2
 label-mode-foreground = #000
 label-mode-background = ${colors.primary}
 
 ; focused = Active workspace on focused monitor
-label-focused = %index%
+label-focused = %name%
 label-focused-background = ${module/bspwm.label-focused-background}
 label-focused-underline = ${module/bspwm.label-focused-underline}
 label-focused-padding = ${module/bspwm.label-focused-padding}
 
 ; unfocused = Inactive workspace on any monitor
-label-unfocused = %index%
+label-unfocused = %name%
 label-unfocused-padding = ${module/bspwm.label-occupied-padding}
 
 ; visible = Active workspace on unfocused monitor
-label-visible = %index%
+label-visible = %name%
 label-visible-background = ${self.label-focused-background}
 label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
 
 ; urgent = Workspace with urgency hint set
-label-urgent = %index%
+label-urgent = %name%
 label-urgent-background = ${module/bspwm.label-urgent-background}
 label-urgent-padding = ${module/bspwm.label-urgent-padding}
 
@@ -465,22 +455,28 @@ format-full = 
 format-full-foreground = ${colors.foreground}
 format-full-underline = ${self.format-charging-underline}
 
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
 ramp-capacity-foreground = ${colors.foreground-alt}
 
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
 animation-charging-foreground = ${colors.foreground}
-animation-charging-framerate = 750
+animation-charging-framerate = 1000
 
-animation-discharging-0 = 
-animation-discharging-1 = 
-animation-discharging-2 = 
+animation-discharging-0 = 
+animation-discharging-1 = 
+animation-discharging-2 = 
+animation-discharging-3 = 
+animation-discharging-4 = 
 animation-discharging-foreground = ${colors.foreground}
-animation-discharging-framerate = 750
+animation-discharging-framerate = 1000
 
 [module/temperature]
 type = internal/temperature
diff --git a/i3wm/.config/polybar/launch.sh b/i3wm/.config/polybar/launch.sh
index a0f26cd..e099ebb 100755
--- a/i3wm/.config/polybar/launch.sh
+++ b/i3wm/.config/polybar/launch.sh
@@ -6,8 +6,15 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
+
 # Launch bar1 and bar2
-MONITOR=$(polybar -m|tail -1|sed -e 's/:.*$//g') polybar topbar &
-MONITOR=$(polybar -m|tail -1|sed -e 's/:.*$//g') polybar topbar-second &
+MONITOR=$(polybar -m|tail -n1|sed -e 's/:.*$//g') polybar topbar &
+
+MONITORS=$(polybar -m|sed -e 's/:.*$//g')
+while read -r monitor; do
+	MONITOR=$monitor polybar topbar-second &
+done <<< $MONITORS
+
+PRIMARY_MONITOR=$(xrandr -q|awk '/ connected primary /'|cut -d ' ' -f1)
 
 echo "Bars launched..."