X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=bin%2Fkhatus_show;h=fc4415a58d95589b46137b6a483a3659a5384fdf;hb=a8c81faf5ef88157d62a6665136597b2294b3b60;hp=ad5b060e8c369e1c1e838f7fa937d46399a5751e;hpb=bd61022dea50d93a4423cd6517092f656c709944;p=khatus.git

diff --git a/bin/khatus_show b/bin/khatus_show
index ad5b060..fc4415a 100755
--- a/bin/khatus_show
+++ b/bin/khatus_show
@@ -44,21 +44,58 @@ disk=$(
         function round(n) {return int(n + 0.5)}
 
         $1 == "/dev/mapper/kubuntu--vg-root" {
-            curr = $5;
-            sub("%$", "", curr);
-            prev_file = "/home/siraaj/var/run/status/disk_space_used_percentage";
-            getline prev < prev_file;
-            print curr > prev_file;
-            if (curr > prev) {
+            curr_blocks = $3;
+            curr_perc = $5; sub("%$", "", curr_perc);
+            prev_file_prefix = "/home/siraaj/var/run/status/disk_space_used";
+
+            prev_perc_file   = prev_file_prefix "_percentage";
+            prev_blocks_file = prev_file_prefix "_blocks";
+
+            getline prev_blocks < prev_blocks_file;
+            getline prev_perc   < prev_perc_file;
+
+            print curr_blocks > prev_blocks_file;
+            print curr_perc > prev_perc_file;
+            if (curr_perc > prev_perc) {
                 direction = ">";
-            } else if (curr < prev) {
+            } else if (curr_perc < prev_perc) {
                 direction = "<";
             } else {
                 direction = "=";
             }
-            printf("%s%d%%", direction, curr);
+            diff_blocks = curr_blocks - prev_blocks;
+            printf("%s[%d%% %d]", direction, curr_perc, diff_blocks);
         }')
 
+io_net=$(
+    awk '
+        BEGIN {
+            bytes_per_unit = 1024 * 1024
+        }
+
+        NR > 2 {
+            device     = $1; sub(":$", "", device);
+            curr_read  = $2;
+            curr_write = $10;
+
+            prev_file_prefix  = "/home/siraaj/var/run/status/io_net_" device;
+            prev_read_file  = prev_file_prefix "_read";
+            prev_write_file = prev_file_prefix "_write";
+
+            getline prev_read < prev_read_file;
+            getline prev_write < prev_write_file;
+
+            diff_read  = (curr_read  - prev_read ) / bytes_per_unit;
+            diff_write = (curr_write - prev_write) / bytes_per_unit;
+
+            print curr_read  > prev_read_file;
+            print curr_write > prev_write_file;
+
+            printf("%s %0.3f▲ %0.3f▼\n", device, diff_write, diff_read);
+        }
+    ' /proc/net/dev
+)
+
 energy=$(
     upower -e \
     | grep battery \
@@ -224,7 +261,7 @@ else
     rm -f "$STATUS_FILE__ENERGY_NOTIFIED_BELLOW_HALF"
 fi
 
-weather="$(cat ~/var/run/metar-KJFK-decoded-temp-fahrenheit)°F"
+weather=$(awk 'NR == 1 {printf("%d°F", $1)}' ~/var/run/metar-KJFK-decoded-temp-fahrenheit)
 
 signal_last_msg_age=$(
     ls -lt --time-style=+%s $HOME/var/lib/signal/latest_message.json \
@@ -252,6 +289,29 @@ signal_last_msg_age=$(
     | tr -d ' '
 )
 
+mpd_state=$(
+    echo 'status' \
+    | nc 127.0.0.1 6600 \
+    | awk '
+        {
+            status[$1] = $2
+        }
+
+        END {
+            state = status["state:"]
+            symbol = "-"
+            if (state == "play") {
+                symbol = "▶"
+            } else if (state == "pause") {
+                symbol = "❚❚"
+            } else if (state == "stop") {
+                symbol = "⬛"
+            }
+            printf("%s", symbol)
+        }
+        '
+)
+
 echo \
 "\
  E$energy\
@@ -275,8 +335,10 @@ echo \
  B:$bluetooth_power\
  \
  \
- W:$wifi\
+ W:[$wifi $(echo "$io_net" | awk '/^wlp3s0/ {print $2, $3}')]\
+ \
  \
+ $mpd_state\
  \
  $signal_last_msg_age\
  \