diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini index 1a9cacf..5304a1d 100644 --- a/.config/polybar/modules.ini +++ b/.config/polybar/modules.ini @@ -20,14 +20,14 @@ label-song-ellipsis = true [module/cpu_bar] type = custom/script exec = ~/.config/polybar/scripts/cpu_usage.py -format-prefix = "%{A1:$TERMINAL_CMD 'top -o %CPU' &:}CPU %{A-}" +format-prefix = "%{A1:$TERMINAL_CMD 'top -o %CPU' &:}CPU %{A}" format-prefix-foreground = ${colors.foreground-alt} interval = 5 [module/memory_bar] type = internal/memory format = -format-prefix = "%{A1:$TERMINAL_CMD 'top -o RES' &:} %{A-}" +format-prefix = "%{A1} %{A}" format-prefix-foreground = ${colors.foreground-alt} bar-used-width = 10 @@ -35,7 +35,7 @@ bar-used-gradient = false bar-used-indicator = bar-used-indicator-foreground = ${colors.foreground} bar-used-indicator-font = 0 -bar-used-fill = "%{A1:$TERMINAL_CMD 'top -o RES' &:}%{T5}_%{T-}%{A-}" +bar-used-fill = "%{A1}%{T5}_%{T-}%{A}" bar-used-foreground-0 = ${colors.bn} bar-used-foreground-1 = ${colors.bn} bar-used-foreground-2 = ${colors.bn} @@ -45,7 +45,7 @@ bar-used-foreground-5 = ${colors.bm} bar-used-foreground-6 = ${colors.bd} bar-used-foreground-7 = ${colors.bd} bar-used-foreground-8 = ${colors.bd} -bar-used-empty = "%{A1:$TERMINAL_CMD 'top -o RES' &:}%{T5}_%{T-}%{A-}" +bar-used-empty = "%{A1}%{T5}_%{T-}%{A}" bar-used-empty-foreground = ${colors.foreground-alt} [module/wireless] @@ -54,7 +54,7 @@ interface = wlp4s0 interval = 3.0 format-connected = -label-connected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%essid%%{A-}" +label-connected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%essid%%{A}" format-disconnected = ramp-signal-0 =  @@ -75,9 +75,9 @@ format-connected = format-connected-prefix = "" format-disconnected = -label-connected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%downspeed:8%  %upspeed:8% %{A-}" +label-connected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%downspeed:8%  %upspeed:8% %{A}" # keep speed meter for other devices -label-disconnected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%downspeed:8%  %upspeed:8% %{A-}" +label-disconnected = "%{A1:/usr/bin/bash ~/.config/polybar/scripts/nmcli_manager:}%downspeed:8%  %upspeed:8% %{A}" [module/network_usage] type = custom/script @@ -127,7 +127,7 @@ click-left = gnome-calendar type = internal/alsa format-volume = -label-volume = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{A-}" +label-volume = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{A}" label-volume-foreground = ${root.foreground} format-muted-prefix = "" @@ -147,8 +147,8 @@ bar-volume-foreground-7 = ${colors.bm} bar-volume-gradient = false bar-volume-indicator = -bar-volume-fill = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{T5}_%{T-}%{A-}" -bar-volume-empty = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{T5}_%{T-}%{A-}" +bar-volume-fill = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{T5}_%{T-}%{A}" +bar-volume-empty = "%{A3:$TERMINAL_CMD 'pulsemixer' &:}%{T5}_%{T-}%{A}" bar-volume-empty-foreground = ${colors.foreground-alt} click-right = $TERMINAL_CMD 'pulsemixer' diff --git a/.config/polybar/scripts/cpu_usage.py b/.config/polybar/scripts/cpu_usage.py index ce2b155..f925e4e 100755 --- a/.config/polybar/scripts/cpu_usage.py +++ b/.config/polybar/scripts/cpu_usage.py @@ -36,7 +36,7 @@ def show_cpu_usage(): if global_count < 10: padding = '%{F' + colors['id'] + '}' + '_' * (10 - global_count) + '%{F-}' - print("%{A1:$TERMINAL_CMD 'top -o %CPU' &:}%{T5}" + bar + padding + "%{T-}%{A-}") + print("%{A1:$TERMINAL_CMD 'top -o %CPU' &:}%{T5}" + bar + padding + "%{T-}%{A}") if __name__ == "__main__": diff --git a/.config/polybar/scripts/spotify.py b/.config/polybar/scripts/spotify.py index 5a18f38..0f779e5 100755 --- a/.config/polybar/scripts/spotify.py +++ b/.config/polybar/scripts/spotify.py @@ -19,7 +19,7 @@ def get_spotify_song(): window_title = artist + ' - ' + title - output = "%{A1:$WM_CONTROL '" + window_title + "' &:}" + window_title + "%{A-}" + output = "%{A1:$WM_CONTROL '" + window_title + "' &:}" + window_title + "%{A}" except dbus.DBusException as e: if (e.get_dbus_message() == f'The name {bus_name} was not provided by any .service files'): pass