General updates

General updates to things due to package differences since last update.

1 files changed, 60 insertions, 88 deletions

diff --git a/.config/polybar/config b/.config/polybar/config
index edb9e87..dcc032a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -1,4 +1,4 @@
-; Skillet's polybar config
+; Danny's Polybar config
 
 [colors]
 peach = #FFCD98
@@ -34,8 +34,8 @@ margin-top = 5
 margin-bottom = 5
 
 [bar/main0]
-;monitor = ${env:MONITOR:HDMI-0}
-monitor = ${env:MONITOR:eDP1}
+monitor = ${env:MONITOR:HDMI-0}
+;monitor = ${env:MONITOR:eDP1}
 width = 100%
 height = 27
 bottom = false
@@ -47,7 +47,7 @@ foreground = ${colors.xcolor1}
 
 overline-size = 0
 overline-color = ${colors.xcolor7}
-underline-size = 0
+underline-size = 2
 underline-color = ${colors.xcolor7}
 
 border-bottom-size = 0
@@ -77,20 +77,22 @@ tray-transparent = false
 tray-background = ${colors.xcolor7}
 
 ; Module layouts
-modules-left = RightArrow2 i3 RightArrow1 RightStripe RightArrow1
-modules-center =
-modules-right = arrow1 LeftStripe arrow1 filesystem arrow2 volume arrow3 cpu arrow2 memory
+modules-left = RightArrow2 i3 xwindow RightArrow1 RightStripe RightArrow1
+modules-center = RightStripe date LeftStripe
+modules-right = arrow1 LeftStripe arrow1 filesystem arrow2 alsa arrow3 cpu arrow2 memory arrow3 updates
 
 
 [bar/main1]
 inherit = bar/main0
 monitor = ${env:MONITOR:DVI-I-1}
 tray-position = none
+modules-left = i3 xwindow RightArrow1 RightStripe RightArrow1
 
 [bar/main2]
 inherit = bar/main0
-monitor = ${env:MONITOR:HDMI-1-2}
+monitor = ${env:MONITOR:DP-0}
 tray-position = none
+modules-left = i3 xwindow RightArrow1 RightStripe RightArrow1
 
 ; Modules
 
@@ -100,24 +102,39 @@ interval = 25
 fixed-values = true
 
 mount-0 = /
-;mount-1 = /home
+mount-1 = /mnt/fileserver
 
-format-mounted = RootFS <label-mounted>
+format-mounted = <label-mounted>
 format-mounted-foreground = ${colors.xcolor7}
 format-mounted-background = ${colors.xcolor1}
 
-;  
-label-mounted = "  %percentage_used%%"
+label-mounted = "%mountpoint%: %percentage_used%%"
 ; %free%% %percentage_used%% %used%
 label-mounted-foreground = ${colors.xcolor7}
 label-mounted-background = ${colors.xcolor1}
-label-unmounted =   %mountpoint%
+label-unmounted = %mountpoint%
 label-unmounted-foreground = ${colors.xcolor7}
 label-unmounted-background = ${colors.xcolor1}
 
+[module/alsa]
+type = internal/alsa
+
+master-soundcard = default
+master-mixer = Master
+
+format-volume = <label-volume>
+format-muted = <label-muted>
+label-volume = VOL %percentage%%
+label-muted = MUTED
+
+format-volume-foreground = ${colors.xcolor1}
+format-volume-background = ${colors.xcolor7}
+format-muted-foreground = ${colors.xcolor1}
+format-muted-background = ${colors.xcolor7}
+
 [module/i3]
 type = internal/i3
-format = <label-state> <label-mode>
+format = <label-state><label-mode>
 index-sort = true
 wrapping-scroll = false
 pin-workspaces = true
@@ -132,7 +149,7 @@ label-focused-font = 3
 label-unfocused = %index%
 label-unfocused-padding = 2
 label-unfocused-foreground = ${colors.xcolor7}
-label-unfocused-background = ${colors.xcolor0}
+label-unfocused-background = ${colors.xcolor1}
 label-occupied = %index%
 label-occupied-foreground = ${colors.xcolor0}
 label-occupied-background = ${colors.xcolor1}
@@ -152,12 +169,17 @@ label-visible = %index%
 label-visible-background = ${self.label-focused-background}
 label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
+label-mode-foreground = ${colors.xcolor7}
+label-mode-background = ${colors.xcolor1}
 
 [module/xwindow]
 type = internal/xwindow
 
-format-foreground = ${colors.xcolor1}
-format-background = ${colors.xcolor0}
+format-foreground = ${colors.xcolor7}
+format-background = ${colors.xcolor1}
+format-padding = 2
+label = %title%
+label-maxlen = 25
 
 [module/xbacklight]
 type = internal/xbacklight
@@ -184,7 +206,7 @@ card = intel_backlight
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = " "
+format-prefix =
 format-foreground = ${colors.xcolor7}
 format-background = ${colors.xcolor1}
 label = CPU %percentage%%
@@ -192,7 +214,7 @@ label = CPU %percentage%%
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
+format-prefix =
 format-foreground = ${colors.xcolor1}
 format-background = ${colors.xcolor7}
 format-margin-top = -5
@@ -203,62 +225,18 @@ label = MEM %percentage_used%%
 type = internal/date
 interval = 1
 
-date = " %Y/%m/%d"
-date-alt = " %Y-%m-%d"
+date = "%Y/%m/%d"
+date-alt = "%Y-%m-%d"
 
 time = %H:%M
 time-alt = " %I:%M:%S %p"
 
 format-foreground = ${colors.xcolor7}
 format-background = ${colors.xcolor1}
+format-padding = 2
 
 label = %date% %time%
 
-[module/volume]
-type = internal/volume
-
-master-soundcard = default
-speaker-soundcard = default
-headphone-soundcard = default
-mapping = true
-
-format-volume = <label-volume>
-;     
-
-label-volume = VOL %percentage%
-label-volume-foreground = ${colors.xcolor1}
-label-volume-background = ${colors.xcolor7}
-label-muted = "  muted"
-label-muted-foreground = ${colors.xcolor7}
-label-muted-background = ${colors.xcolor1}
-
-ramp-volume-0 = "  "
-ramp-volume-0-foreground = ${colors.xcolor7}
-ramp-volume-0-background = ${colors.xcolor1}
-ramp-volume-1 = "  "
-ramp-volume-1-foreground = ${colors.xcolor7}
-ramp-volume-1-background = ${colors.xcolor1}
-ramp-volume-2 = "  "
-ramp-volume-2-foreground = ${colors.xcolor7}
-ramp-volume-2-background = ${colors.xcolor1}
-ramp-volume-3 = "  "
-ramp-volume-3-foreground = ${colors.xcolor7}
-ramp-volume-3-background = ${colors.xcolor1}
-
-bar-volume-width = 10
-bar-volume-background = #495858
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = true
-bar-volume-indicator = "|"
-bar-volume-fill = ─
-bar-volume-empty = ─
-
 [module/battery]
 type = internal/battery
 ; To list battery & adapter: $ ls -1 /sys/class/power_supply/
@@ -266,7 +244,7 @@ battery = BAT0
 adapter = AC0
 full-at = 99
 
-format-charging = <animation-charging> <label-charging>
+format-charging = <label-charging>
 format-charging-foreground = ${colors.xcolor7}
 format-charging-background = ${colors.xcolor1}
 format-discharging = <ramp-capacity> <label-discharging>
@@ -276,24 +254,12 @@ format-full = <label-full>
 format-full-foreground = ${colors.xcolor7}
 format-full-background = ${colors.xcolor1}
 
-label-charging = "%percentage%% "
-label-discharging = "%percentage%% "
+label-charging = "BAT %percentage%%"
+label-discharging = "BAT %percentage%%"
 label-discharging-foreground = ${colors.xcolor7}
-label-full = "  %percentage%% "
-; 
-ramp-capacity-0 = " "
-ramp-capacity-0-foreground = ${colors.xcolor4}
-ramp-capacity-1 = " "
-ramp-capacity-1-foreground = ${colors.xcolor4}
-ramp-capacity-2 = " "
-ramp-capacity-3 = " "
-ramp-capacity-4 = " "
-animation-charging-0 = " "
-animation-charging-1 = " "
-animation-charging-2 = " "
-animation-charging-3 = " "
-animation-charging-4 = " "
-animation-charging-framerate = 750
+label-full = "Battery Full"
+
+; Powerline
 
 [module/pipe]
 type = custom/text
@@ -362,9 +328,15 @@ content = "◢"
 content-foreground = ${colors.xcolor0}
 content-background = ${colors.xcolor1}
 
+[module/updates]
+type = custom/script
+exec = pacman -Qu | wc -l
+format = <label>
+format-foreground = ${colors.xcolor7}
+format-background = ${colors.xcolor1}
+format-padding = 1
+label = Updates: %output%
+interval = 90
+
 [settings]
 screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over