all: overhaul, move dotfile specifics to .local/share/dotfiles and more

3 files changed, 64 insertions, 2 deletions

diff --git a/basics/.local/bin/statusbar/cpu b/basics/.local/bin/statusbar/cpu
new file mode 100755
index 0000000..6a89024
--- /dev/null
+++ b/basics/.local/bin/statusbar/cpu
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# TODO: finish it
+
+# /proc/stat format:
+# cpu[n] user nice system idle iowait irq softirq steal guest guest_nice
+
+# format user nice system idle steal total
+# total = user + nice + system + idle + steal
+prevstat=$(awk '
+/^cpu[0-9]+/ {print $2, $3, $4, $5, $9, ($2 + $3 + $4 + $5 + $9)}' /proc/stat)
+
+sleep 0.5
+
+
+stat=$(awk '
+/^cpu[0-9]+/ {print $2, $3, $4, $5, $9, ($2 + $3 + $4 + $5 + $9)}' /proc/stat)
+
+
+num_cpu=$(echo "$stat" | wc -l)
+
+get_load() {
+    line=${1:-1}
+    last=$(echo "$stat" | sed "${line}q;d")
+    prev=$(echo "$prevstat" | sed "${line}q;d")
+    read -r u n s last_idle st last_total <<< "$last"
+    #echo "$u $n $s $last_idle $st $last_total"
+    read -r u n s prev_idle st prev_total <<< "$prev"
+    #echo "$u $n $s $prev_idle $st $prev_total"
+    diff=$(echo "$last_total $prev_total" | awk '{printf "%d", $1 - $2}')
+    [ "$diff" = "0" ] && return
+    percentage=$(echo "$diff $last_idle $prev_idle" | awk '{printf "%.2f", 100.0 * (($1 - ($2 - $3)) / $1)}')
+    echo -e "$percentage"
+}
+
+total_load=0
+
+for i in $(seq 1 "$num_cpu"); do
+    load=$(get_load "$i")
+    total_load=$(echo "$total_load $load" | awk '{printf "%.2f", $1 + $2}')
+done
+
+total_percentage=$(echo "$total_load $num_cpu" | awk '{printf "%.2f", ($1 / $2) + 0.5}')
+echo -e "$total_percentage"
+
+#read -r cpu a b c previdle rest < /proc/stat
+#prevtotal=$((a+b+c+previdle))
+#sleep 0.5
+#read -r cpu a b c idle rest < /proc/stat
+#total=$((a+b+c+idle))
+#cpu=$((100*( (total-prevtotal) - (idle-previdle) ) / (total-prevtotal) ))
+#echo -e "$cpu"
+
+exit 0
diff --git a/basics/.local/bin/statusbar/memory b/basics/.local/bin/statusbar/memory
index 7a952d8..77f462b 100755
--- a/basics/.local/bin/statusbar/memory
+++ b/basics/.local/bin/statusbar/memory
@@ -13,8 +13,8 @@ print Total ":" Available ":" Free ":" Buffers ":" Cached ":" SReclaimable ":" S
 
 echo "$meminfo" |
     while IFS=: read -r t a f b c sr sh; do
-        memfree=$(echo "$a $t" | awk '{printf "%.3f", ($1 / $2) * 100}')
-        memused=$(echo "$memfree" | awk '{printf "%.3f", (100 - $1)}')
+        memfree=$(echo "$a $t" | awk '{printf "%.2f", ($1 / $2) * 100}')
+        memused=$(echo "$memfree" | awk '{printf "%.2f", (100 - $1)}')
 
         # Percentage values
         # TODO: other values, controllable by flags?
diff --git a/basics/.local/bin/statusbar/swap b/basics/.local/bin/statusbar/swap
new file mode 100755
index 0000000..787ed23
--- /dev/null
+++ b/basics/.local/bin/statusbar/swap
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+awk '
+/^SwapTotal:/ {Total=$2/(1024 * 1024)}
+/^SwapFree:/ {Free=$2/(1024 * 1024)}
+/^SwapCached:/ {Cached=$2/(1024 * 1024)}
+END {
+printf "%.2f %.2f %.2f %.2f\n", Total, Free, Cached, (Total - Free)}' /proc/meminfo