From 9ca9c905c8fbd0c250c44b09505a256bd2c42e4f Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 31 Jan 2018 12:47:48 -0600
Subject: [PATCH] Polybar: Refactor colors

---
 .config/polybar/config | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index b1044536..9c43d0d8 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -19,13 +19,8 @@ icon-wlan = ${xrdb:color6}
 icon-xbacklight = ${xrdb:color7}
 
 background = ${xrdb:background}
-background-2 = ${xrdb:bg2}
-background-3 = ${xrdb:bg3}
-background-4 = ${xrdb:bg4}
+background-mute = ${xrdb:bg4}
 foreground = ${xrdb:color15}
-foreground-2 = ${xrdb:fg2}
-foreground-3 = ${xrdb:fg3}
-foreground-4 = ${xrdb:fg4}
 
 [res/config]
 padding = 2
@@ -48,7 +43,7 @@ font-4 =
 # Rendering of the bar
 width = 100%
 height = 30
-wm-restack = ${env:PB_WM_RESTACK:i3}
+wm-restack = ${env:PB_WM_RESTACK:bspwm}
 
 # Module padding and spacing
 module-margin = 1
@@ -107,7 +102,7 @@ modules-right =
 [module/|]
 type = custom/text
 content = " "
-content-foreground = ${res/colors.background-4}
+content-foreground = ${res/colors.background-mute}
 
 # OTHER
 #====================
@@ -133,7 +128,7 @@ label-focused-background = ${res/colors.secondary}
 
 label-visible = ${self.label-focused}
 label-visible-padding = ${res/config.padding}
-label-visible-background = ${res/colors.background-4}
+label-visible-background = ${res/colors.background-mute}
 
 label-unfocused = ${self.label-focused}
 label-unfocused-padding = ${res/config.padding}
@@ -204,7 +199,7 @@ label-focused-background = ${res/colors.secondary}
 label-dimmed = ${self.label-focused}
 label-dimmed-padding = ${res/config.padding}
 label-dimmed-foreground = ${self.label-focused-foreground}
-label-dimmed-background = ${res/colors.background-4}
+label-dimmed-background = ${res/colors.background-mute}
 
 label-occupied = ${self.label-focused}
 label-occupied-padding = ${res/config.padding}
@@ -218,14 +213,14 @@ label-urgent-background = ${res/colors.background}
 
 label-empty = ${self.label-focused}
 label-empty-padding = ${res/config.padding}
-label-empty-foreground = ${res/colors.background-4}
+label-empty-foreground = ${res/colors.background-mute}
 label-empty-background = ${res/colors.background}
 
 
 [module/battery]
 type = internal/battery
 format-charging = <ramp-capacity>
-format-charging-background = ${res/colors.background-4}
+format-charging-background = ${res/colors.background-mute}
 format-discharging = <ramp-capacity><label-discharging>
 format-discharging-background = ${res/colors.icon-battery}
 format-full = <label-full>
@@ -235,7 +230,7 @@ interval = 15
 
 label-charging = %percentage%%
 label-charging-padding = ${res/config.padding}
-label-charging-foreground = ${res/colors.background-4}
+label-charging-foreground = ${res/colors.background-mute}
 label-charging-background = ${res/colors.background}
 label-discharging = %percentage%%
 label-discharging-padding = ${self.label-charging-padding}
@@ -268,7 +263,7 @@ animation-charging-7 = ${self.ramp-capacity-7}
 animation-charging-8 = ${self.ramp-capacity-8}
 animation-charging-padding = ${self.ramp-capacity-padding}
 animation-charging-foreground = ${res/colors.background}
-animation-charging-background = ${res/colors.background-4}
+animation-charging-background = ${res/colors.background-mute}
 animation-charging-framerate = 500
 
 [module/cpu]
@@ -340,7 +335,7 @@ label-volume-background = ${res/colors.background}
 label-muted = 
 label-muted-padding = ${res/config.padding}
 label-muted-foreground = ${res/colors.background}
-label-muted-background = ${res/colors.background-4}
+label-muted-background = ${res/colors.background-mute}
 
 [module/wlan]
 type = internal/network
@@ -354,7 +349,7 @@ label-connected-background = ${res/colors.background}
 label-disconnected = 
 label-disconnected-padding = ${res/config.padding}
 label-disconnected-foreground = ${res/colors.background}
-label-disconnected-background = ${res/colors.background-4}
+label-disconnected-background = ${res/colors.background-mute}
 
 ramp-signal-0 = 
 ramp-signal-1 = 