2 files changed, 36 insertions, 52 deletions
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index b062b7c..465d7b6 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -1,37 +1,32 @@
 [colors]
-;background = ${xrdb:color0:#222}
-;background = #10152c
-;background = #080f1f
-background = #101010
-background-alt = #1b2f60
-background-module = #1a301e
-;foreground = ${xrdb:color7:#222}
-foreground = #f1e1b7
-foreground-alt = #254183
-primary = #ffb52a
-secondary = #e60053
+bg = #1e1e2e
+fg = #cdd6f4
+blue = #89b4fa
+purple = #cba6f7
+green = #a6e3a1
+yellow = #f9e2af
+orange = #fab387
+red = #f38ba8
+black = #000
+white = #FFF
+gray = #999
 alert = #bd2c40
 
+# i3wm 
+focused-bg = #254183
+unfocused-bg = #2c2c39
+visible-bg = #182858
+
 [bar/bar1]
 monitor = DP-2
 width = 100%
 height = 28
-;offset-x = 1%
-;offset-y = 1%
-; radius = 0
 fixed-center = true
 bottom = true
 
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-; line-size = 0
-; line-color = #f00
-
-; border-size = 0
-; border-color = #00000000
+background = ${colors.bg}
+foreground = ${colors.fg}
 
-; module-margin-left = 0
 module-margin-right = 2
 
 padding-left = 2
@@ -59,18 +54,11 @@ enable-ipc = true
 monitor = DP-4.8
 width = 100%
 height = 30
-; radius = 0
 fixed-center = false
 bottom = true
 
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-; line-size = 0
-line-color = #f00
-
-; border-size = 0
-border-color = #00000000
+background = ${colors.bg}
+foreground = ${colors.fg}
 
 module-margin-left = 1
 module-margin-right = 2
@@ -97,10 +85,11 @@ format = <label-layout><label-indicator>
 format-spacing = 1
 
 label-layout-padding = 2
-label-layout-background = ${colors.background-module}
+label-layout-foreground = ${colors.yellow}
 
 label-indicator-padding = 2
-label-indicator-background = ${colors.secondary}
+label-indicator-background = ${colors.alert}
+label-indicator-foreground = ${colors.white}
 
 [module/i3]
 type = internal/i3
@@ -112,24 +101,23 @@ wrapping-scroll = false
 pin-workspaces = true
 
 label-mode-padding = 3
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
+label-mode-foreground = ${colors.black}
+label-mode-background = ${colors.purple}
 
 ; focused = Active workspace on focused monitor
 label-focused = %index%
-label-focused-background = ${colors.background-module}
-label-focused-underline= ${colors.primary}
+label-focused-background = ${colors.focused-bg}
+label-focused-foreground = ${colors.yellow}
 label-focused-padding = 3
 
 ; unfocused = Inactive workspace on any monitor
 label-unfocused = %index%
-label-unfocused-background = #151514
+label-unfocused-background = ${colors.unfocused-bg}
 label-unfocused-padding = 3
 
 ; visible = Active workspace on unfocused monitor
 label-visible = %index%
-label-visible-background = #242423
-label-visible-underline = ${self.label-focused-underline}
+label-visible-background = ${colors.visible-bg}
 label-visible-padding = ${self.label-focused-padding}
 
 ; urgent = Workspace with urgency hint set
@@ -150,7 +138,7 @@ time-alt = %H:%M
 time = %H:%M
 
 label = %date%%time%
-label-background = ${colors.background-module}
+label-foreground = ${colors.blue}
 label-padding = 2
 
 [module/date2]
@@ -164,22 +152,19 @@ time = %H:%M
 time-alt = %H:%M
 
 label = %date%%time% 
-label-background = ${colors.background-module}
+label-foreground = ${colors.blue}
 label-padding = 2
 
 [module/pulseaudio]
 type = internal/pulseaudio
-
 format-volume = <label-volume> 
 
 label-volume = "  %percentage%"
-label-volume-foreground = ${root.foreground}
-label-volume-background = ${colors.background-module}
+label-volume-foreground = ${colors.green}
 label-volume-padding = 2
 
 label-muted = "  muted"
-label-muted-foreground = #999
-label-muted-background = ${colors.background-module}
+label-muted-foreground = ${colors.gray}
 label-muted-padding = 2
 
 [module/xwindow]
@@ -191,15 +176,14 @@ label-maxlen = 60
 type = custom/script
 exec = /home/adam/.config/polybar/extra/updates-pacman-aurhelper.sh
 interval = 600
-format-foreground = ${root.foreground}
-format-background = ${colors.background-module}
+format-foreground = ${colors.orange}
 format-padding = 2
 
 [module/weather]
 type = custom/script
 exec = /home/adam/.local/bin/forecast
 interval = 600
-format-background = ${colors.background-module}
+format-foreground = ${colors.purple}
 format-padding = 2
 
 [settings]
diff --git a/.config/polybar/extra/updates-pacman-aurhelper.sh b/.config/polybar/extra/updates-pacman-aurhelper.sh
index 3f631b6..a785cd7 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