From 71949de0f7dadd027f5bb95958ed1c417045e5d7 Mon Sep 17 00:00:00 2001
From: frosty <passedgoandgot200@gmail.com>
Date: Thu, 4 Jul 2024 17:01:41 -0400
Subject: [PATCH] remove a few scripts, and move all monitors to a single
 script

---
 .config/xmobar/xmobarrc    |  10 ++--
 .local/bin/batmon          |  16 -----
 .local/bin/cpumon          |  29 ----------
 .local/bin/diskusage       |   7 ---
 .local/bin/ipmon           |   7 ---
 .local/bin/loadmon         |   9 ---
 .local/bin/memmon          |  21 -------
 .local/bin/monitors        | 116 +++++++++++++++++++++++++++++++++++++
 .local/bin/netmon          |  21 -------
 .local/bin/pipe_nowplaying |   8 ---
 .local/bin/pipe_volume     |   2 +-
 .local/bin/ssidmon         |  17 ------
 .local/bin/tempmon         |  15 -----
 .local/bin/uppretty        |   3 -
 .local/bin/volmon          |   9 ---
 15 files changed, 122 insertions(+), 168 deletions(-)
 delete mode 100755 .local/bin/batmon
 delete mode 100755 .local/bin/cpumon
 delete mode 100755 .local/bin/diskusage
 delete mode 100755 .local/bin/ipmon
 delete mode 100755 .local/bin/loadmon
 delete mode 100755 .local/bin/memmon
 create mode 100755 .local/bin/monitors
 delete mode 100755 .local/bin/netmon
 delete mode 100755 .local/bin/pipe_nowplaying
 delete mode 100755 .local/bin/ssidmon
 delete mode 100755 .local/bin/tempmon
 delete mode 100755 .local/bin/uppretty
 delete mode 100755 .local/bin/volmon

diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc
index f6f992a..3f8209b 100644
--- a/.config/xmobar/xmobarrc
+++ b/.config/xmobar/xmobarrc
@@ -7,12 +7,12 @@ Config
     , template = " %XMonadLog% }{ %network% <fc=#777777>:</fc> VOL %volume% <fc=#777777>:</fc> %battery% <fc=#777777>:</fc> CPU %cpu% <fc=#777777>:</fc> RAM %memory% <fc=#777777>:</fc> %load% <fc=#777777>:</fc> <fc=#f7e83b>%date%</fc> "
     , commands =
         [ Run XMonadLog
-        , Run Com "netmon" [] "network" 6000
+        , Run Com "monitors" ["network"] "network" 6000
         , Run PipeReader "/tmp/pipe-volume" "volume"
-        , Run Com "batmon" [] "battery" 36000
-        , Run Com "cpumon" [] "cpu" 50
-        , Run Com "memmon" [] "memory" 50
-        , Run Com "loadmon" [] "load" 6000
+        , Run Com "monitors" ["battery"] "battery" 36000
+        , Run Com "monitors" ["cpu"] "cpu" 50
+        , Run Com "monitors" ["memory"] "memory" 50
+        , Run Com "monitors" ["load"] "load" 6000
         , Run Date "%d/%m/%Y %H:%M:%S" "date" 10
         ]
     }
diff --git a/.local/bin/batmon b/.local/bin/batmon
deleted file mode 100755
index 980be5f..0000000
--- a/.local/bin/batmon
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-FULL_THRESHOLD=80
-FULL_COLOR="#31f53e"
-
-read -r capacity </sys/class/power_supply/BAT1/capacity
-read -r status </sys/class/power_supply/BAT1/status
-
-if [ "$capacity" -ge "$FULL_THRESHOLD" ] && [ "$status" = "Not charging" ]; then
-	status="Full"
-fi
-if [ "$status" = "Full" ]; then
-	printf '<fc=%s>%s%%</fc> (%s)\n' "$FULL_COLOR" "$capacity" "$status"
-else
-	printf '%s%% (%s)\n' "$capacity" "$status"
-fi
diff --git a/.local/bin/cpumon b/.local/bin/cpumon
deleted file mode 100755
index a06097e..0000000
--- a/.local/bin/cpumon
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-while read -r _ user _ system idle _; do
-	initial_user_sys=$((user + system))
-	initial_total=$((user + system + idle))
-	break
-done </proc/stat
-
-sleep 1
-
-while read -r _ user _ system idle _; do
-	current_user_sys=$((user + system))
-	current_total=$((user + system + idle))
-	break
-done </proc/stat
-
-while read -r line; do
-	case $line in
-	*Package\ id\ 0:*) temp=$line ;;
-	esac
-done <<EOF
-$(sensors)
-EOF
-
-temp=${temp#Package id 0:*+}
-temp=${temp%%°*}
-temp=${temp%.*}
-
-printf '%s°C (%.*f%%)\n' "$temp" 0 $(((current_user_sys - initial_user_sys) * 100 / (current_total - initial_total)))
diff --git a/.local/bin/diskusage b/.local/bin/diskusage
deleted file mode 100755
index 5a6b139..0000000
--- a/.local/bin/diskusage
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-location=${1:-/}
-
-[ -d "$location" ] || exit
-
-df -h "$location" | awk ' /[0-9]/ {print $3 "/" $2}'
diff --git a/.local/bin/ipmon b/.local/bin/ipmon
deleted file mode 100755
index faf498a..0000000
--- a/.local/bin/ipmon
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-address=$(ip route get 1)
-address=${address#* via * dev * src }
-address=${address% uid *}
-
-printf '%s\n' "$address"
diff --git a/.local/bin/loadmon b/.local/bin/loadmon
deleted file mode 100755
index 45b0086..0000000
--- a/.local/bin/loadmon
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-while read -r one five fifteen _; do
-	load_one=$one
-	load_five=$five
-	load_fifteen=$fifteen
-done </proc/loadavg
-
-printf '%s %s %s\n' "$load_one" "$load_five" "$load_fifteen"
diff --git a/.local/bin/memmon b/.local/bin/memmon
deleted file mode 100755
index 800e300..0000000
--- a/.local/bin/memmon
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-convert_to_human_readable() {
-	if [ "$1" -lt 1024 ]; then
-		printf "%.1fK\n" "$1"
-	elif [ "$1" -lt 1048576 ]; then
-		printf "%.1fM\n" $(($1 / 1024))
-	else
-		printf "%.1fG\n" $(($1 / 1048576))
-	fi
-}
-
-while read -r label size _; do
-	case $label in
-	MemTotal:) total_mem=$size ;;
-	MemAvailable:) free_mem=$size ;;
-	esac
-done </proc/meminfo
-used_mem=$((total_mem - free_mem))
-
-printf '%s (%s%%)\n' "$(convert_to_human_readable "$used_mem")" $((used_mem * 100 / total_mem))
diff --git a/.local/bin/monitors b/.local/bin/monitors
new file mode 100755
index 0000000..6942d8e
--- /dev/null
+++ b/.local/bin/monitors
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+BATTERY_FULL_THRESHOLD=80
+BATTERY_FULL_COLOR="#31f53e"
+
+WIFI_ADAPTER="wlan0"
+
+readable_kib() {
+	if [ "$1" -lt 1024 ]; then
+		printf "%.1fK\n" "$1"
+	elif [ "$1" -lt 1048576 ]; then
+		printf "%.1fM\n" $(($1 / 1024))
+	else
+		printf "%.1fG\n" $(($1 / 1048576))
+	fi
+}
+
+monitor_battery() {
+	read -r capacity </sys/class/power_supply/BAT1/capacity
+	read -r status </sys/class/power_supply/BAT1/status
+
+	if [ "$capacity" -ge "$BATTERY_FULL_THRESHOLD" ] && [ "$status" = "Not charging" ]; then
+		status="Full"
+	fi
+	if [ "$status" = "Full" ]; then
+		printf '<fc=%s>%s%%</fc> (%s)\n' "$BATTERY_FULL_COLOR" "$capacity" "$status"
+	else
+		printf '%s%% (%s)\n' "$capacity" "$status"
+	fi
+}
+
+monitor_cpu() {
+	while read -r _ user _ system idle _; do
+		initial_user_sys=$((user + system))
+		initial_total=$((user + system + idle))
+		break
+	done </proc/stat
+
+	sleep 1
+
+	while read -r _ user _ system idle _; do
+		current_user_sys=$((user + system))
+		current_total=$((user + system + idle))
+		break
+	done </proc/stat
+
+	while read -r line; do
+		case $line in
+		*Package\ id\ 0:*) temp=$line ;;
+		esac
+	done <<EOF
+$(sensors)
+EOF
+
+	temp=${temp#Package id 0:*+}
+	temp=${temp%%°*}
+	temp=${temp%.*}
+
+	printf '%s°C (%.*f%%)\n' "$temp" 0 $(((current_user_sys - initial_user_sys) * 100 / (current_total - initial_total)))
+}
+
+monitor_load() {
+	while read -r one five fifteen _; do
+		load_one=$one
+		load_five=$five
+		load_fifteen=$fifteen
+	done </proc/loadavg
+
+	printf '%s %s %s\n' "$load_one" "$load_five" "$load_fifteen"
+}
+
+monitor_memory() {
+	while read -r label size _; do
+		case $label in
+		MemTotal:) total_mem=$size ;;
+		MemAvailable:) free_mem=$size ;;
+		esac
+	done </proc/meminfo
+	used_mem=$((total_mem - free_mem))
+
+	printf '%s (%s%%)\n' "$(readable_kib "$used_mem")" $((used_mem * 100 / total_mem))
+}
+
+monitor_network() {
+	address=$(ip route get 1)
+	address=${address#* via * dev * src }
+	address=${address% uid *}
+
+	ssid=
+	while read -r line; do
+		case $line in
+		*Connected\ network*)
+			ssid=${line##*Connected network}
+			ssid="${ssid#"${ssid%%[![:space:]]*}"}"
+			;;
+		esac
+	done <<EOF
+$(iwctl station "$WIFI_ADAPTER" show)
+EOF
+
+	printf '<fc=#fc7932>%s</fc> @ %s\n' "$address" "$ssid"
+}
+
+monitor_volume() {
+	volume=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
+	volume=${volume% \[MUTED\]}
+	volume=${volume#Volume: }
+	volume=${volume%.*}${volume#*.}
+	volume=${volume#0}
+
+	printf '%s%%\n' "$volume"
+}
+
+if command -v monitor_"$1" >/dev/null 2>&1; then
+	monitor_"$1"
+fi
diff --git a/.local/bin/netmon b/.local/bin/netmon
deleted file mode 100755
index c069604..0000000
--- a/.local/bin/netmon
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-ADAPTER="wlan0"
-
-address=$(ip route get 1)
-address=${address#* via * dev * src }
-address=${address% uid *}
-
-ssid=
-while read -r line; do
-	case $line in
-	*Connected\ network*)
-		ssid=${line##*Connected network}
-		ssid="${ssid#"${ssid%%[![:space:]]*}"}"
-		;;
-	esac
-done <<EOF
-$(iwctl station "$ADAPTER" show)
-EOF
-
-printf '<fc=#fc7932>%s</fc> @ %s\n' "$address" "$ssid"
diff --git a/.local/bin/pipe_nowplaying b/.local/bin/pipe_nowplaying
deleted file mode 100755
index 1e1d1c4..0000000
--- a/.local/bin/pipe_nowplaying
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-TEXT_COLOR="#fe8019"
-
-PIPE_FILE="/tmp/pipe-nowplaying"
-[ -p "$PIPE_FILE" ] || mkfifo "$PIPE_FILE"
-
-echo "<fc=$TEXT_COLOR>$(mpc | head -n1)</fc>" >"$PIPE_FILE"
diff --git a/.local/bin/pipe_volume b/.local/bin/pipe_volume
index 8bf7c64..4aca780 100755
--- a/.local/bin/pipe_volume
+++ b/.local/bin/pipe_volume
@@ -3,4 +3,4 @@
 PIPE_FILE="/tmp/pipe-volume"
 [ -p "$PIPE_FILE" ] || mkfifo "$PIPE_FILE"
 
-volmon >"$PIPE_FILE"
+monitors volume >"$PIPE_FILE"
diff --git a/.local/bin/ssidmon b/.local/bin/ssidmon
deleted file mode 100755
index ef52a1d..0000000
--- a/.local/bin/ssidmon
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-ADAPTER="wlan0"
-
-ssid=
-while read -r line; do
-	case $line in
-	*Connected\ network*)
-		ssid=${line##*Connected network}
-		ssid="${ssid#"${ssid%%[![:space:]]*}"}"
-		;;
-	esac
-done <<EOF
-$(iwctl station "$ADAPTER" show)
-EOF
-
-printf '%s\n' "$ssid"
diff --git a/.local/bin/tempmon b/.local/bin/tempmon
deleted file mode 100755
index c6da32d..0000000
--- a/.local/bin/tempmon
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-while read -r line; do
-	case $line in
-	*Package\ id\ 0:*) temp=$line ;;
-	esac
-done <<EOF
-$(sensors)
-EOF
-
-temp=${temp#Package id 0:*+}
-temp=${temp%%°*}
-temp=${temp%.*}
-
-printf '%s°C\n' "$temp"
diff --git a/.local/bin/uppretty b/.local/bin/uppretty
deleted file mode 100755
index 3e5ef98..0000000
--- a/.local/bin/uppretty
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-uptime -p | sed 's/up //; s/,//g'
diff --git a/.local/bin/volmon b/.local/bin/volmon
deleted file mode 100755
index 51f8f60..0000000
--- a/.local/bin/volmon
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-volume=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
-volume=${volume% \[MUTED\]}
-volume=${volume#Volume: }
-volume=${volume%.*}${volume#*.}
-volume=${volume#0}
-
-printf '%s%%\n' "$volume"