Merge branch 'polybar-fixes' into 'master'

Multiple polybar adjustments

Closes #2 and #1

See merge request severinkaderli/dotfiles!1

system/.config/polybar/config

@@ -9,60 +9,74 @@
 #
 # USAGE:
 # This file is automatically used by Polybar.
-[colors]
-background = #222D32
-foreground = #A1B0B8
 
+#######################################
+# Variables
+#######################################
+[settings]
+padding = 4
+background-color = #222D32
+foreground-color = #A1B0B8
+bar-height = 35
+
+#######################################
+# Top bar
+#######################################
 [bar/top]
 monitor = HDMI-1
+
 width = 100%
-height = 35 
+height =  ${settings.bar-height}
 offset-x = 0
 offset-y = 0 
 
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-padding-right = 2
-module-margin = 2
-
 font-0 = Noto Sans:pixelsize=12;3 
 font-1 = Noto Sans CJK JP:pixelsize=12;3
 font-2 = Font Awesome 5 Free:style=Solid::pixelsize=12;3
 font-3 = Font Awesome 5 Brands:pixelsize=12;3
 font-4 = siji:pixelsize=12;3
+background = ${settings.background-color}
+foreground = ${settings.foreground-color}
+
+padding-right = 2
+module-margin = 2
 
 modules-left = i3
 modules-center = xwindow
 modules-right = battery volume backlight wlan date power
+tray-position = none
 separator = |
 
-#wm-restack = i3
-
 scroll-up = i3wm-desknext
 scroll-down = i3wm-deskprev
 
-tray-position = right
-
 [bar/top2]
 inherit = bar/top
 monitor = eDP-1
 
+
+#######################################
+# Bottom bar
+#######################################
 [bar/bottom]
 inherit = bar/top
 bottom = true
 modules-left = 
 modules-center = 
 modules-right = music
+tray-position = left
 
 [bar/bottom2]
 inherit = bar/bottom
 monitor = eDP-1
+tray-position = none
 
 
+#######################################
+# i3 workspaces
+#######################################
 [module/i3]
 type = internal/i3
-# Only show workspaces on the same output as the bar
 pin-workspaces = true
 strip-wsnumbers = true
 index-sort = true
@@ -70,71 +84,64 @@ enable-click = true
 enable-scroll = true
 wrapping-scroll = false
 
-label-mode = %mode%
+format = <label-state> <label-mode>
-label-mode-padding = 1
 
+label-mode = [ %mode% ]
+label-mode-padding = ${settings.padding}
 
 label-focused = %name%
-label-focused-foreground = ${colors.background}
+label-focused-foreground = ${settings.background-color}
-label-focused-background = ${colors.foreground}
+label-focused-background = ${settings.foreground-color}
-label-focused-padding = 4
+label-focused-padding = ${settings.padding}
 
 label-unfocused = %name%
-label-unfocused-padding = 4
+label-unfocused-padding = ${settings.padding}
 
 label-visible = %name%
-label-visible-padding = 4
+label-visible-padding = ${settings.padding}
 
 label-urgent = %name%
-label-urgent-foreground = ${colors.foreground}
+label-urgent-foreground = ${settings.foreground-color}
-label-urgent-background = ${colors.background}
+label-urgent-background = ${settings.background-color}
-label-urgent-padding = 4
+label-urgent-padding = ${settings.padding}
 
+
+#######################################
+# Active window title
+#######################################
 [module/xwindow]
 type = internal/xwindow
-label = %title:0:50:...%
 
-[module/date]
+format = <label>
-type = custom/script
+label = %title%
-exec = date +"%F %H:%M:%S"
+label-maxlen = 50
-format =    <label>
-label = %output%
-interval = 1
-click-left = xdg-open "https://www.google.com/calendar/render#g"
 
+
+#######################################
+# Battery indicator
+#######################################
 [module/battery]
 type = internal/battery
-
-; This is useful in case the battery never reports 100% charge
 full-at = 99
-
-; Use the following command to list batteries and adapters:
-; $ ls -1 /sys/class/power_supply/
 battery = BAT0
 adapter = AC
+time-format = %H:%M
 
-; If an inotify event haven't been reported in this many
-; seconds, manually poll for new values.
-;
-; Needed as a fallback for systems that don't report events
-; on sysfs/procfs.
-;
-; Disable polling by setting the interval to 0.
-;
-; Default: 5
-poll-interval = 5
-time-format = %Hh%Mm
 label-full =  %percentage%%
-label-charging = %percentage%% %time%
+
 format-charging = <animation-charging> <label-charging>
-label-discharging = %percentage%% %time%
+label-charging = %percentage%% %time%
+
 format-discharging = <ramp-capacity> <label-discharging>
+label-discharging = %percentage%% %time%
+
 ramp-capacity-0 = 
 ramp-capacity-1 = 
 ramp-capacity-2 = 
 ramp-capacity-3 = 
 ramp-capacity-4 = 
-ramp-capacity-foreground = ${colors.foreground}
+ramp-capacity-foreground = ${settings.foreground-color}
+
 animation-charging-0 = 
 animation-charging-1 = 
 animation-charging-2 = 
@@ -142,63 +149,107 @@ animation-charging-3 = 
 animation-charging-4 = 
 animation-charging-framerate = 500
 
+interval = 5
+poll-interval = 5
+
+
+#######################################
+# Volume indicator
+#######################################
+[module/volume]
+type = internal/pulseaudio
+use-ui-max = true
+
+format-volume = <ramp-volume> <label-volume>
+label-volume = %percentage%%
+
+format-muted =  <label-muted>
+label-muted = %percentage%%
+
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+
+interval = 5
+
+
+#######################################
+# Brightness indicator
+#######################################
+[module/backlight]
+type = custom/script
+exec = light -G | cut -d. -f1
+
+format =  <label>
+label = %output%%
+
+interval = 0.1
+
+scroll-up = light -A 5
+scroll-down = light -U 5
+
+
+#######################################
+# WiFi indicator
+#######################################
 [module/wlan]
 type = internal/network
 interface = wlp3s0
-interval = 3.0
 
-format-connected = %{A1:wicd-client -n:}<ramp-signal> <label-connected>%{A}
+format-connected = %{A1:wicd-client -n &:}<ramp-signal> <label-connected>%{A}
-format-connected-underline = #9f78e1
 label-connected = %essid%
 
-format-disconnected = Disconnected
+format-disconnected = %{A1:wicd-client -n &:}<label-disconnected>%{A}
-;format-disconnected = <label-disconnected>
+label-disconnected = Disconnected
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground}
 
 ramp-signal-0 = 
 ramp-signal-1 = 
 ramp-signal-2 = 
 ramp-signal-3 = 
 ramp-signal-4 = 
-ramp-signal-foreground = ${colors.foreground}
+ramp-signal-foreground = ${settings.foreground-color}
 
-[module/volume]
+interval = 1
-type = internal/pulseaudio
-use-ui-max = true
-interval = 5
 
-format-volume = <ramp-volume> <label-volume>
-format-muted = <label-muted>
-label-volume = %percentage%%
-label-muted =  %percentage%%
-label-muted-foreground = #aaa
 
-ramp-volume-0 = 
+#######################################
-ramp-volume-1 = 
+# Time and date
-ramp-volume-2 = 
+#######################################
-
+[module/date]
-[module/backlight]
 type = custom/script
-exec = light -G | cut -d. -f1
+exec = date +"%F %H:%M:%S"
-format =  <label>
-label = %output%%
-scroll-up = light -A 5
-scroll-down = light -U 5
-interval = 0.1
 
+format =    <label>
+label = %output%
+
+interval = 1
+
+click-left = xdg-open "https://calendar.google.com"
+
+
+#######################################
+# Power menu
+#######################################
 [module/power]
 type = custom/script
 exec = echo -e "\uf011"
+
 format = <label>
 label = %output%
+
 interval = 5
+
 click-left = $HOME/bin/power.sh
 
+
+#######################################
+# Music status in the bottom bar
+#######################################
 [module/music]
 type = custom/script
 exec = $HOME/bin/music.sh
+
 format = <label>
 label = %output%
-interval = 1
+
+interval = 0.5