Merge branch 'main' into neptun

1 files changed, 56 insertions, 94 deletions

diff --git a/dot.config-polybar-config b/dot.config-polybar-config
index 1f06286..a554f65 100644
--- a/dot.config-polybar-config
+++ b/dot.config-polybar-config
@@ -3,8 +3,7 @@
 background = #222
 background-alt = #444
 foreground = #dfdfdf
-#foreground-alt = #555
-foreground-alt = #00ff00
+green = #00ff00
 primary = #ffb52a
 secondary = #e60053
 alert = #bd2c40
@@ -35,12 +34,12 @@ module-margin-left = 0
 module-margin-right = 1
 
 font-0 = "Source Code Pro Medium:size=11;1"
-font-1 = "Wuncon Siji:size=8;1"
-font-2 = "Noto Emoji:size=8;0"
+font-1 = "Font Awesome 5 Free:size=11;2"
+font-2 = "Font Awesome 5 Free Solid:size=11;2"
 
 modules-left = i3
 modules-center = mpd
-modules-right = pulseaudio xkeyboard memory cpu eth temperature date
+modules-right = pulseaudio xkeyboard filesystem memory cpu loadavg eth temperature date
 
 tray-position = right
 tray-padding = 0
@@ -54,19 +53,26 @@ scroll-down = i3wm-wsprev
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+[module/loadavg]
+type = custom/script
+exec = cut -d' ' -f-3 /proc/loadavg
+
+format-prefix = " "
+format-underline = #ffb52a
+
 [module/xkeyboard]
 type = internal/xkeyboard
 blacklist-0 = num lock
 
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
+format = <label-layout><label-indicator>
+
+format-prefix = " "
 format-prefix-underline = ${colors.secondary}
 
 label-layout = %name%
 label-layout-underline = ${colors.secondary}
 
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
+label-indicator-background = ${colors.alert}
 
 [module/filesystem]
 type = internal/fs
@@ -74,9 +80,9 @@ interval = 25
 
 mount-0 = /
 
-label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
+label-mounted = %free%
+format-mounted-underline = #0a81f5
+format-mounted-prefix = " "
 
 [module/i3]
 type = internal/i3
@@ -112,38 +118,23 @@ label-urgent = %index%
 label-urgent-background = ${colors.alert}
 label-urgent-padding = 1
 
-[module/mpd]
-type = internal/mpd
-format-online = <label-song> <icon-prev> <icon-stop> <toggle> <icon-next>
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-
-label-song = %title% (%artist%)
-label-song-maxlen = 25
-label-song-ellipsis = true
-
 [module/backlight-acpi]
 type = internal/backlight
 card = intel_backlight
-format-underline = #9f78e1
+format-prefix = " "
+format-underline = #4bffdc
 
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
+format-prefix = " "
+format-underline = ${colors.secondary}
 label = %percentage:2%%
 
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix = " "
 format-underline = #4bffdc
 label = %gb_used%
 
@@ -152,18 +143,13 @@ type = internal/network
 interface = wlp3s0
 interval = 3.0
 
-format-connected = <ramp-signal> <label-connected>
+format-connected = <label-connected>
 format-connected-underline = #9f78e1
-label-connected = %essid% %signal%%
+label-connected = " %essid% %signal%%"
 
-format-disconnected =
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = ${colors.foreground-alt}
+label-disconnected = ""
+format-disconnected-foreground = #666
+format-disconnected-underline = #9f78e1
 
 [module/eth]
 type = internal/network
@@ -171,8 +157,7 @@ interface = enp6s0
 interval = 3.0
 
 format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
+format-connected-prefix = " "
 label-connected = %local_ip%
 
 format-disconnected =
@@ -181,14 +166,13 @@ format-disconnected =
 type = internal/date
 interval = 1
 
-date-alt =
-date = " %Y-%m-%d"
+date-alt = ""
+date = " %a %Y-%m-%d"
 
 time-alt = %H:%M
 time = %H:%M:%S
 
-format-prefix = 
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix = 
 format-underline = #0a6cf5
 
 label = %date% %time%
@@ -196,36 +180,19 @@ label = %date% %time%
 [module/pulseaudio]
 type = internal/pulseaudio
 
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL %percentage%%
-label-volume-foreground = ${root.foreground}
+format-volume = <ramp-volume> <label-volume>
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+label-volume = %percentage%%
 
-;label-muted = 🔇 muted
-; FIXME
-label-muted = muted
+label-muted = 
 label-muted-foreground = #666
 
-bar-volume-width = 10
-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 = false
-bar-volume-indicator = |
-;bar-volume-indicator-font = 2
-bar-volume-fill = ─
-;bar-volume-fill-font = 2
-bar-volume-empty = ─
-;bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
+click-right = pavucontrol
 
 [module/battery]
 type = internal/battery
-battery = BAT0
-adapter = AC
 full-at = 98
 
 format-charging = <animation-charging> <label-charging>
@@ -234,26 +201,20 @@ format-charging-underline = #ffb52a
 format-discharging = <animation-discharging> <label-discharging>
 format-discharging-underline = ${self.format-charging-underline}
 
-format-full-prefix = " "
-format-full-prefix-foreground = ${colors.foreground-alt}
+format-full-prefix = " "
+format-full-prefix-foreground = ${colors.green}
 format-full-underline = ${self.format-charging-underline}
 
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = ${colors.foreground-alt}
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = ${colors.foreground-alt}
-animation-charging-framerate = 750
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-foreground = ${colors.green}
+animation-charging-framerate = 1000
 
-animation-discharging-0 = 
-animation-discharging-1 = 
-animation-discharging-2 = 
-animation-discharging-foreground = ${colors.foreground-alt}
-animation-discharging-framerate = 750
+animation-discharging-0 = 
+animation-discharging-1 = 
+animation-discharging-2 = 
+animation-discharging-framerate = 1000
 
 label-full = %percentage%% %consumption%W
 label-charging = %percentage%% %consumption%W %time%
@@ -264,7 +225,7 @@ time-format = %H:%M
 [module/temperature]
 type = internal/temperature
 thermal-zone = 0
-warn-temperature = 60
+base-temperature = 20
 
 format = <ramp> <label>
 format-underline = #f50a4d
@@ -275,10 +236,11 @@ label = %temperature-c%
 label-warn = %temperature-c%
 label-warn-foreground = ${colors.secondary}
 
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = ${colors.foreground-alt}
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-3 = 
+ramp-4 = 
 
 [settings]
 screenchange-reload = true