updates

10 files changed, 20 insertions, 14 deletions

diff --git a/ar/.local/bin/statusbar/sb-battery b/ar/.local/bin/statusbar/sb-battery
index faf3d04..fc02f61 100755
--- a/ar/.local/bin/statusbar/sb-battery
+++ b/ar/.local/bin/statusbar/sb-battery
@@ -10,7 +10,7 @@ get_status_icon() {
   Discharging) echo "🔋" ;;
   Charging) echo "🔌" ;;
   "Not charging") echo "🛑" ;;
-  Unknown) echo "♻️" ;;
+  Unknown) echo "♻" ;;
   *) echo "" ;;
   esac
 }
@@ -57,7 +57,7 @@ case "$BLOCK_BUTTON" in
 2) bluetooth && devices "hid*" ;; # Middle click for Bluetooth battery levels
 3) notify-send "🔋 Battery module" "\- 🔋: discharging
 - 🛑: not charging
-- ♻️: stagnant charge
+- ♻: stagnant charge
 - 🔌: charging
 - ⚡: fully charged
 - ❗: battery very low!
diff --git a/ar/.local/bin/statusbar/sb-bghitness b/ar/.local/bin/statusbar/sb-bghitness
index 0aabfb6..83dc809 100755
--- a/ar/.local/bin/statusbar/sb-bghitness
+++ b/ar/.local/bin/statusbar/sb-bghitness
@@ -10,7 +10,7 @@ max_brightness=$(cat /sys/class/backlight/*/max_brightness)
 brightness_per=$((100 * curr_brightness / max_brightness))
 
 case $BLOCK_BUTTON in
-3) notify-send "💡 Brightness module" "\- Shows current brightness level ☀️." ;;
+3) notify-send "💡 Brightness module" "\- Shows current brightness level ☀ ." ;;
 4) pkexec brillo -A 5 -q ;;
 5) pkexec brillo -U 5 -q ;;
 6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
diff --git a/ar/.local/bin/statusbar/sb-cpu b/ar/.local/bin/statusbar/sb-cpu
index 565ca26..0cb6f4f 100755
--- a/ar/.local/bin/statusbar/sb-cpu
+++ b/ar/.local/bin/statusbar/sb-cpu
@@ -9,4 +9,4 @@ case $BLOCK_BUTTON in
 6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-sensors | awk '/Core 0/ {printf "🧁%d°\n", $3}'
+sensors | awk '/Tctl:/ {gsub(/[+°C]/,"",$2); printf "🧁%s°", $2}'
diff --git a/ar/.local/bin/statusbar/sb-forecast b/ar/.local/bin/statusbar/sb-forecast
index d9dded0..4f78303 100755
--- a/ar/.local/bin/statusbar/sb-forecast
+++ b/ar/.local/bin/statusbar/sb-forecast
@@ -59,7 +59,7 @@ gethightemp() { jq -r '.weather[0].hourly[].tempC' "$weatherreportjson" | sort -
 gethumidity() {
   humidity=$(get_nearest_hourly | jq -r '.humidity')
   case "$humidity" in
-  [0-9] | [1-2][0-9]) echo "🏜️: $humidity%" ;;
+  [0-9] | [1-2][0-9]) echo "🏜: $humidity%" ;;
   [3-4][0-9]) echo "🌲: $humidity%" ;;
   [5-6][0-9]) echo "💧: $humidity%" ;;
   [7-8][0-9]) echo "💦: $humidity%" ;;
@@ -351,7 +351,7 @@ case $BLOCK_BUTTON in
 🥶: Daily lowest temperature
 🥵: Daily highest temperature"
   notify-send "$(todayweather)"
-  notify-send "🗺️ Doppler RADAR module" "\- Middle click for local Doppler RADAR
+  notify-send "🗺 Doppler RADAR module" "\- Middle click for local Doppler RADAR
 - Shift + middle click to update RADAR location
 After $secs seconds, new clicks will also automatically update the doppler RADAR"
   ;;
diff --git a/ar/.local/bin/statusbar/sb-internet b/ar/.local/bin/statusbar/sb-internet
index baa5ebd..1484f33 100755
--- a/ar/.local/bin/statusbar/sb-internet
+++ b/ar/.local/bin/statusbar/sb-internet
@@ -2,7 +2,7 @@
 
 # Show wifi 🛜 and percent strength or 📡 if none.
 # Show 🌐 if connected to ethernet or ❎ if none.
-# Show 🛰️ if a vpn connection is active
+# Show 🛰 if a vpn connection is active
 
 eth_con="$(nmcli -t -f NAME,TYPE,DEVICE connection show |
   awk -F: '$2=="ethernet" && $3!="" { print $1; exit }')"
diff --git a/ar/.local/bin/statusbar/sb-iplocate b/ar/.local/bin/statusbar/sb-iplocate
index d84445e..d7a9349 100755
--- a/ar/.local/bin/statusbar/sb-iplocate
+++ b/ar/.local/bin/statusbar/sb-iplocate
@@ -10,6 +10,6 @@ set -e
 ifinstalled "geoip"
 addr="$(geoiplookup "$(curl -sfm 1 ifconfig.me 2>/dev/null)")"
 name="${addr##*, }"
-flag="$(grep "flag: $name" "${XDG_DATA_HOME:-${HOME}/.local/share}/larbs/emoji")"
+flag="$(grep "flag: $name" "${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/chars/emoji")"
 flag="${flag%% *}"
 printf "%s %s\\n" "$flag" "$name"
diff --git a/ar/.local/bin/statusbar/sb-memory b/ar/.local/bin/statusbar/sb-memory
index 5b06d29..01eb0e6 100755
--- a/ar/.local/bin/statusbar/sb-memory
+++ b/ar/.local/bin/statusbar/sb-memory
@@ -10,9 +10,15 @@ case $BLOCK_BUTTON in
 esac
 
 width=$(xrandr | grep "\*" | awk '{print $1}' | sed 's/x[0-9]*//g' | head -n1)
+nvme_temp=$(sensors 2>/dev/null |
+  awk '/Composite:/ {gsub(/[+°C]/,"",$2); print $2; exit}')
 
 if [ -n "$width" ] && [ "$width" -eq "$width" ] 2>/dev/null; then
-  [ "$width" -lt 1920 ] &&
-    free --mebi | sed -n '2{p;q}' | awk '{printf ("🐏%d%%\n", ($3/$2)*100+0.5 )}' ||
-    free --mebi | sed -n '2{p;q}' | awk '{printf ("🐏%dGB/%dGB", $3/1000+0.5,$2/1000+0.5)}'
+  if [ "$width" -lt 1920 ]; then
+    free --mebi | sed -n '2{p;q}' |
+      awk -v t="$nvme_temp" '{printf "💾%s° 🐏%d%%\n", t, ($3/$2)*100+0.5}'
+  else
+    free --mebi | sed -n '2{p;q}' |
+      awk -v t="$nvme_temp" '{printf "💾%s° 🐏%dGB/%dGB", t, $3/1000+0.5, $2/1000+0.5}'
+  fi
 fi
diff --git a/ar/.local/bin/statusbar/sb-music b/ar/.local/bin/statusbar/sb-music
index a71969f..d730116 100755
--- a/ar/.local/bin/statusbar/sb-music
+++ b/ar/.local/bin/statusbar/sb-music
@@ -61,7 +61,7 @@ case $BLOCK_BUTTON in
 1) setsid -f "$TERMINAL" -e ncmpcpp ;; # left click, opens ncmpcpp
 2) mpc toggle ;;                       # middle click, pause/unpause
 3)                                     # right click
-  { [ -n "$(mpc current)" ] && [ -n "$(mpc queued)" ]; } && notify-send "🎵 $(mpc current)" "⏭️ $(mpc queued)"
+  { [ -n "$(mpc current)" ] && [ -n "$(mpc queued)" ]; } && notify-send "🎵 $(mpc current)" "⏭  $(mpc queued)"
   notify-send "🎵 Music module" "\- Shows mpd song playing and status
 - 🎵 if playing
 - ⏸ if paused
diff --git a/ar/.local/bin/statusbar/sb-tasks b/ar/.local/bin/statusbar/sb-tasks
index 66be81b..5fc61df 100755
--- a/ar/.local/bin/statusbar/sb-tasks
+++ b/ar/.local/bin/statusbar/sb-tasks
@@ -67,7 +67,7 @@ $(printf "%b" "$overdue_list")"
   ;;
 2) check_task_sync ;;
 3)
-  notify-send "🗂️ Task Module" "Shows task counts.
+  notify-send "🗂 Task Module" "Shows task counts.
 - Left click: Show tasks due soon.
 - Middle click: Show follow-up tasks."
   ;;
diff --git a/ar/.local/bin/statusbar/sb-torrent b/ar/.local/bin/statusbar/sb-torrent
index ec104b4..3e4b729 100755
--- a/ar/.local/bin/statusbar/sb-torrent
+++ b/ar/.local/bin/statusbar/sb-torrent
@@ -5,7 +5,7 @@ status=$(transmission-remote -l | grep % |
 	s/.*Stopped.*/A 🛑/;
 	s/.*Seeding.*/Z 🌱/;
 	s/.*100%.*/N ✅/;
-	s/.*Idle.*/B 🕰️/;
+	s/.*Idle.*/B 🕰/;
 	s/.*Uploading.*/L 🔼/;
 	s/.*Downloading.*/M 🔽/;
   s/.*%.*/Q ❓/" |