polybar: no hardcoded padding

2 files changed, 45 insertions, 20 deletions

diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 55dfb6c..008cb43 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -53,9 +53,9 @@ type = internal/xkeyboard
 
 blacklist-0 = num lock
 format = <label-layout><label-indicator>
-format-spacing = 0
+format-spacing = 1
 
-label-layout = "  %layout%  "
+label-layout-padding = 2
 label-layout-background = ${colors.background-module}
 
 label-indicator-padding = 2
@@ -108,9 +108,13 @@ format-charging = <animation-charging> <label-charging>
 format-discharging = <ramp-capacity> <label-discharging>
 format-full = <ramp-capacity> <label-full>
 
-label-charging = "%percentage%  "
-label-discharging = "%percentage%  "
-label-full = "%percentage%  "
+label-charging = %percentage%
+label-discharging = %percentage%
+label-full = %percentage%
+
+label-charging-padding-right = 2
+label-discharging-padding-right = 2
+label-full-padding-right = 2
 
 format-charging-background = ${colors.background-module}
 format-discharging-background = ${colors.background-module}
@@ -119,17 +123,19 @@ label-charging-background = ${colors.background-module}
 label-discharging-background = ${colors.background-module}
 label-full-background = ${colors.background-module} 
 
-ramp-capacity-0 = "   "
-ramp-capacity-1 = "   "
-ramp-capacity-2 = "   "
-ramp-capacity-3 = "   "
-ramp-capacity-4 = "   "
-
-animation-charging-0 = "   "
-animation-charging-1 = "   "
-animation-charging-2 = "   "
-animation-charging-3 = "   "
-animation-charging-4 = "   "
+ramp-capacity-padding-left = 2
+ramp-capacity-0 = " "
+ramp-capacity-1 = " "
+ramp-capacity-2 = " "
+ramp-capacity-3 = " "
+ramp-capacity-4 = " "
+
+animation-charging-padding-left = 2
+animation-charging-0 = " "
+animation-charging-1 = " "
+animation-charging-2 = " "
+animation-charging-3 = " "
+animation-charging-4 = " "
 animation-charging-framerate = 750
 
 [module/date]
@@ -142,8 +148,23 @@ date = "%a, %d %b "
 time-alt = %H:%M
 time = %H:%M
 
-label = "  %date%%time%  " 
+label = %date%%time%
+label-background = ${colors.background-module}
+label-padding = 2
+
+[module/date2]
+type = internal/date
+interval = 5
+
+date = ""
+date-alt = "%a, %d %b "
+
+time = %H:%M
+time-alt = %H:%M
+
+label = %date%%time% 
 label-background = ${colors.background-module}
+label-padding = 2
 
 [module/pulseaudio]
 type = internal/pulseaudio
@@ -151,13 +172,15 @@ type = internal/pulseaudio
 format-volume = <label-volume>
 format-volume-background = ${colors.background} 
 
-label-volume = "    %percentage%  "
+label-volume = "  %percentage%"
 label-volume-foreground = ${root.foreground}
 label-volume-background = ${colors.background-module}
+label-volume-padding = 2
 
-label-muted = "    muted  "
+label-muted = "  muted"
 label-muted-foreground = #999
 label-muted-background = ${colors.background-module}
+label-muted-padding = 2
 
 [module/xwindow]
 type = internal/xwindow
@@ -170,12 +193,14 @@ exec = /home/adam/.config/polybar/extra/updates-pacman-aurhelper.sh
 interval = 600
 format-foreground = ${root.foreground}
 format-background = ${colors.background-module}
+format-padding = 2
 
 [module/forecast]
 type = custom/script
 exec = /home/adam/.local/bin/forecast
 interval = 600
 format-background = ${colors.background-module}
+format-padding = 2
 
 [settings]
 screenchange-reload = true
diff --git a/.config/polybar/extra/updates-pacman-aurhelper.sh b/.config/polybar/extra/updates-pacman-aurhelper.sh
index 20d5a8f..3f631b6 100755
--- a/.config/polybar/extra/updates-pacman-aurhelper.sh
+++ b/.config/polybar/extra/updates-pacman-aurhelper.sh
@@ -16,7 +16,7 @@ fi
 updates=$((updates_arch + updates_aur))
 
 if [ "$updates" -gt 0 ]; then
-    echo "   $updates  "
+    echo " $updates"
 else
     echo ""
 fi