frosty/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/frosty/dotfiles.git synced 2024-09-19 11:47:09 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

(xmobar): fix inconsistencies with how colors were determined, and change colors for cpu and battery normal

Browse source
This commit is contained in:
frosty 2024-07-16 05:15:34 -04:00
parent a01d43ec64
commit 40a80a7d4d
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
.local/bin/monitors
View file

@ -5,6 +5,7 @@ STATUS_OK_COLOR="#f58c31"
STATUS_UNWELL_COLOR="#f53131" STATUS_UNWELL_COLOR="#f53131"
BATTERY_NAME="BAT1" BATTERY_NAME="BAT1"
BATTERY_EMPTY_THRESHOLD=20
BATTERY_FULL_THRESHOLD=80 BATTERY_FULL_THRESHOLD=80
WIFI_ADAPTER="wlan0" WIFI_ADAPTER="wlan0"
@ -14,6 +15,8 @@ DISK_ICON_COLOR="#48a3e8"
NOW_PLAYING_COLOR="#e647a1" NOW_PLAYING_COLOR="#e647a1"
NOW_PLAYING_STATE_COLOR="#ccca4e" NOW_PLAYING_STATE_COLOR="#ccca4e"
DEFAULT_COLOR="#cccccc"
readable_kib() { readable_kib() {
data="${1:-}" data="${1:-}"
decimals="${2:-}" decimals="${2:-}"
@ -64,17 +67,25 @@ monitor_battery() {
# TODO(frosty): Add more icons based on other statuses. # TODO(frosty): Add more icons based on other statuses.
case $status in case $status in
"Full" | "Charging") icon="" ;; "Full" | "Charging")
"Not charging") icon="" ;; icon=""
*) icon="" ;; color="$STATUS_WELL_COLOR"
;;
"Not charging")
icon=""
color="$STATUS_OK_COLOR"
;;
*)
icon=""
color="$DEFAULT_COLOR"
;;
esac esac
# TODO(frosty): Check for other statuses, and print a different color. if [ "$capacity" -le "$BATTERY_EMPTY_THRESHOLD" ] && [ "$status" != "Charging" ]; then
if [ "$status" = "Full" ]; then color="$STATUS_UNWELL_COLOR"
printf '%s <fc=%s>%s%%</fc> (%s)\n' "$icon" "$STATUS_WELL_COLOR" "$capacity" "$status"
else
printf '%s %s%% (%s)\n' "$icon" "$capacity" "$status"
fi fi
printf '%s <fc=%s>%s%%</fc> (%s)\n' "$icon" "$color" "$capacity" "$status"
} }
monitor_cpu() { monitor_cpu() {
@ -107,7 +118,7 @@ EOF
usage_percent="$(printf '%i\n' $(((current_user_sys - initial_user_sys) * 100 / (current_total - initial_total))))" usage_percent="$(printf '%i\n' $(((current_user_sys - initial_user_sys) * 100 / (current_total - initial_total))))"
case "$usage_percent" in case "$usage_percent" in
[0-9] | [0-3][0-9]) color="$STATUS_WELL_COLOR" ;; [0-9] | [0-3][0-9]) color="$DEFAULT_COLOR" ;;
[4-5][0-9]) color="$STATUS_OK_COLOR" ;; [4-5][0-9]) color="$STATUS_OK_COLOR" ;;
*) color="$STATUS_UNWELL_COLOR" ;; *) color="$STATUS_UNWELL_COLOR" ;;
esac esac
@ -149,14 +160,15 @@ monitor_memory() {
esac esac
done </proc/meminfo done </proc/meminfo
used_mem="$((total_mem - free_mem))" used_mem="$((total_mem - free_mem))"
usage_percent="$((used_mem * 100 / total_mem))"
# TODO(frosty): Add other colors for usage percentages. usage_percent="$((used_mem * 100 / total_mem))"
if [ "$usage_percent" -lt 50 ]; then case "$usage_percent" in
printf '%s (<fc=%s>%s%%</fc>)\n' "$(readable_kib "$used_mem" 1)" "$STATUS_WELL_COLOR" "$usage_percent" [0-9] | [1-3][0-9]) color="$DEFAULT_COLOR" ;;
else [4-6][0-9]) color="$STATUS_OK_COLOR" ;;
printf '%s (%s%%)\n' "$(readable_kib "$used_mem" 1)" "$usage_percent" *) color="$STATUS_UNWELL_COLOR" ;;
fi esac
printf '%s (<fc=%s>%s%%</fc>)\n' "$(readable_kib "$used_mem" 1)" "$color" "$usage_percent"
} }
monitor_ssid() { monitor_ssid() {