polybar: cleanup

polybar/config

@@ -1,9 +1,14 @@
-[colors]
+[config]
 	background = #222222
 	background-alt = #444444
 	foreground = #cdcdcd
 	foreground-alt = #7d7d7d
 
+	padding = 2
+
+	date = %%{F#7d7d7d}%Y-%m-%d%%{F-}  %%{F#cdcdcd}%H:%M%%{F-}
+	date-alt =   %%{F#7d7d7d}%A, %d %B %Y  %%{F#cdcdcd}%H:%M:%S%%{F-}
+
 [bar/top]
 	;monitor = ${env:MONITOR:HDMI-1}
 	width = 100%
@@ -11,8 +16,8 @@
 	radius = 0
 	fixed-center = true
 
-	background = ${colors.background}
+	background = ${config.background}
-	foreground = ${colors.foreground}
+	foreground = ${config.foreground}
 
 	line-size = 2
 	line-color = #f00
@@ -20,7 +25,7 @@
 	border-size = 0
 
 	padding-left = 0
-	padding-right = 2
+	padding-right = ${config.padding}
 
 	module-margin-left = 4
 	module-margin-right = 4
@@ -31,13 +36,6 @@
 
 	modules-left = i3 xwindow
 	modules-right = xkeyboard volume wlan eth battery date
-	;modules-center = cpu memory
-
-	;tray-position = right
-	;tray-padding = 2
-	;tray-transparent = true
-	;tray-background = #0063ff
-	;tray-transparent = true
 
 ;i3
 [module/i3]
@@ -50,16 +48,16 @@
 	; Only show workspaces on the same output as the bar
 	;pin-workspaces = true
 
-	label-mode-padding = 2
+	label-mode-padding = ${config.padding}
-	label-mode-foreground = ${colors.foreground}
+	label-mode-foreground = ${config.foreground}
-	label-mode-background = ${colors.background-alt}
+	label-mode-background = ${config.background-alt}
-	label-mode-underline = ${colors.foreground}
+	label-mode-underline = ${config.foreground}
 
 	; focused = Active workspace on focused monitor
 	label-focused = %index%
-	label-focused-background = ${colors.background-alt}
+	label-focused-background = ${config.background-alt}
-	label-focused-underline = ${colors.foreground}
+	label-focused-underline = ${config.foreground}
-	label-focused-padding = 2
+	label-focused-padding = ${config.padding}
 
 	; unfocused = Inactive workspace on any monitor
 	label-unfocused = %index%
@@ -86,29 +84,11 @@
 	type = internal/xkeyboard
 	format = <label-indicator><label-layout>
 	blacklist-0 = num lock
-	label-layout-padding = 2
+	label-layout-padding = ${config.padding}
-	label-layout-underline = ${colors.foreground}
+	label-layout-underline = ${config.foreground}
 	label-indicator-font = 1
 	label-indicator-on = 
-	label-indicator-underline = ${colors.foreground}
+	label-indicator-underline = ${config.foreground}
-
-;cpu
-[module/cpu]
-	type = internal/cpu
-	interval = 2
-	format-prefix = "cpu "
-	format-prefix-foreground = ${colors.foreground-alt}
-	;format-underline = #f90000
-	label = %percentage%%
-
-;mem
-[module/memory]
-	type = internal/memory
-	interval = 2
-	format-prefix = "ram "
-	format-prefix-foreground = ${colors.foreground-alt}
-	;format-underline = #4bffdc
-	label = %percentage_used%%
 
 ;network
 [module/wlan]
@@ -119,35 +99,22 @@
 	format-connected = <ramp-signal> <label-connected>
 	label-connected = %essid%
 
-	format-disconnected =
-	;format-disconnected = <label-disconnected>
-	;format-disconnected-underline = ${self.format-connected-underline}
-	;label-disconnected = %ifname% disconnected
-	;label-disconnected-foreground = ${colors.foreground-alt}
-
 	ramp-signal-0 = 
 	ramp-signal-1 = 
 	ramp-signal-2 = 
 	ramp-signal-3 = 
 	ramp-signal-4 = 
-	ramp-signal-foreground = ${colors.foreground}
+	ramp-signal-foreground = ${config.foreground}
 
 [module/eth]
 	type = internal/network
-	interface = enp2s0
+	interface = enp4s0
 	interval = 3.0
 
 	format-connected-prefix = "  "
-	format-connected-prefix-foreground = ${colors.foreground}
+	format-connected-prefix-foreground = ${config.foreground}
 	label-connected = %local_ip%
 
-	format-disconnected =
-	;format-disconnected = <label-disconnected>
-	;format-disconnected-underline = ${self.format-connected-underline}
-	;label-disconnected = %ifname% disconnected
-	;label-disconnected-foreground = ${colors.foreground-alt}
-
-;backlight
 ;volume
 [module/volume]
 	type = internal/pulseaudio
@@ -156,9 +123,10 @@
 
 	format-volume = <label-volume>   <bar-volume>
 	label-volume = 
-	label-volume-foreground = ${colors.foreground}
+	bar-volume-font = 1
+	label-volume-foreground = ${config.foreground}
 
-	format-muted-foreground = ${colors.background-alt}
+	format-muted-foreground = ${config.background-alt}
 	label-muted =    ━━━━━━━━━━━━━━━━━━━
 
 	bar-volume-width = 20
@@ -168,15 +136,12 @@
 	bar-volume-foreground-3 = #888
 	bar-volume-foreground-4 = #999
 	bar-volume-foreground-5 = #aaa
-	bar-volume-foreground-6 = ${colors.foreground}
+	bar-volume-foreground-6 = ${config.foreground}
 	bar-volume-gradient = false
 	bar-volume-indicator =
-	bar-volume-indicator-font = 0
 	bar-volume-fill = ━
-	bar-volume-fill-font = 1
 	bar-volume-empty = ━
-	bar-volume-empty-font = 1
+	bar-volume-empty-foreground = ${config.background-alt}
-	bar-volume-empty-foreground = ${colors.background-alt}
 
 ;battery
 [module/battery]
@@ -201,5 +166,5 @@
 ;time date
 [module/date]
 	type = internal/date
-	date = %%{F#7d7d7d}%Y-%m-%d%%{F-}  %%{F#cdcdcd}%H:%M%%{F-}
+	date = ${config.date}
-	date-alt =   %%{F#7d7d7d}%A, %d %B %Y  %%{F#cdcdcd}%H:%M:%S%%{F-}
+	date-alt = ${config.date-alt}