From ef29c7ddd5835c1fe9da436fe23a5e529efe04c9 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Yadav <ashishkumar.yadav@students.iiserpune.ac.in>
Date: Mon, 23 Nov 2020 11:42:13 +0530
Subject: [PATCH] Improved blocks

---
 blocks/battery.sh  |  3 ++-
 blocks/calendar.sh |  3 ++-
 blocks/cpu_temp.sh |  9 ++++++---
 blocks/time.sh     |  3 ++-
 blocks/volume.sh   | 36 +++++++++++++++++++++++++++++-------
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/blocks/battery.sh b/blocks/battery.sh
index c58af37..685de1c 100755
--- a/blocks/battery.sh
+++ b/blocks/battery.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+ICON="
"
 read -r capacity </sys/class/power_supply/BAT0/capacity
-echo "
${capacity}%"
+echo "${ICON}${capacity}%"
diff --git a/blocks/calendar.sh b/blocks/calendar.sh
index efe471e..fee078a 100755
--- a/blocks/calendar.sh
+++ b/blocks/calendar.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
-echo "$(date '+%a, %d %b')"
+ICON=""
+echo "${ICON}$(date '+%a, %d %b')"
diff --git a/blocks/cpu_temp.sh b/blocks/cpu_temp.sh
index 05eb588..997d208 100755
--- a/blocks/cpu_temp.sh
+++ b/blocks/cpu_temp.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
-crit=70
+ICONc="" # icon for critical temperatures
+ICONn="" # icon for normal temperatures
+
+crit=70 # critical temperature
 
 read -r temp </sys/class/thermal/thermal_zone0/temp
 temp=${temp%???}
 
 if [ "$temp" -ge "$crit" ] ; then
-    echo "${temp}°C"
+    echo "${ICONc}${temp}°C"
 else
-    echo "${temp}°C"
+    echo "${ICONn}${temp}°C"
 fi
diff --git a/blocks/time.sh b/blocks/time.sh
index 2e95aad..0b37dfc 100755
--- a/blocks/time.sh
+++ b/blocks/time.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
-echo "$(date '+%H:%M')"
+ICON=""
+echo "${ICON}$(date '+%H:%M')"
diff --git a/blocks/volume.sh b/blocks/volume.sh
index bf7eaed..4bad9a5 100755
--- a/blocks/volume.sh
+++ b/blocks/volume.sh
@@ -1,9 +1,31 @@
 #!/bin/sh
+ICONhm="" # headphone plugged in, muted
+ICONhn="" # headphone plugged in, not muted
+ICONsm="" # headphone unplugged, muted
+ICONsn="" # headphone unplugged, not muted
 
-volstat=$(pamixer --get-mute --get-volume)
-
-if "${volstat% *}" ; then
-    echo "${volstat#* }%"
-else
-    echo "${volstat#* }%"
-fi
+pacmd list-sinks |
+    awk -v iconhm="$ICONhm" -v iconhn="$ICONhn" -v iconsm="$ICONsm" -v iconsn="$ICONsn" '
+        /\* index: /,0 {
+            if ($1 == "index:") {
+                exit
+            } else if ($1 == "muted:" && $2 == "yes") {
+                muted = 1
+            } else if ($1 == "volume:") {
+                volumel = $3
+                volumer = $10
+                volumelp = $5
+                volumerp = $12
+            } else if ($1 == "active" && $2 == "port:" && $3 ~ /headphones/) {
+                headphone = 1
+            }
+        }
+        END {
+            printf "%s", headphone ? (muted ? iconhm : iconhn) : (muted ? iconsm : iconsn)
+            if (volumel == volumer) {
+                print volumelp
+            } else {
+                printf "L%s R%s\n", volumelp, volumerp
+            }
+        }
+    '