Merge remote-tracking branch 'origin/master'

For desktop

4 files changed, 10 insertions, 4 deletions

diff --git a/Scripts/.local/scripts/status/bluetooth-status b/Scripts/.local/scripts/status/bluetooth-status
index c34694c..6de5422 100755
--- a/Scripts/.local/scripts/status/bluetooth-status
+++ b/Scripts/.local/scripts/status/bluetooth-status
@@ -1,9 +1,15 @@
 #!/usr/bin/env sh
 
 name=$(bluetoothctl info | grep "Name" | sed 's/.*Name: //')
+battery=$(bluetoothctl info | grep "Battery" | sed 's/.*(//;s/)//')
 if [ ! "$name" ]
 then
     echo ""
 else
-    echo "" $name;
+    echo -n "" $name;
+    if [ "$battery" ]
+    then
+        echo -n " ($battery%)"
+    fi
+    echo ""
 fi
diff --git a/Scripts/.local/scripts/status/datetime b/Scripts/.local/scripts/status/datetime
index c688bb5..65ebe14 100755
--- a/Scripts/.local/scripts/status/datetime
+++ b/Scripts/.local/scripts/status/datetime
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo " $(date +'%A %d %b %R')"
+echo " $(date +'%A %d %b %R')"
diff --git a/Scripts/.local/scripts/status/memory b/Scripts/.local/scripts/status/memory
index fae4dea..2d1c328 100755
--- a/Scripts/.local/scripts/status/memory
+++ b/Scripts/.local/scripts/status/memory
@@ -11,4 +11,4 @@ then
     emacs="N/A"
 fi
 
-echo "⾎ $(printf "%dMB" $used) $value% ->  $emacs"
+echo "⾝ $(printf "%dMB" $used) $value% -> $emacs"
diff --git a/Scripts/.local/scripts/status/volume b/Scripts/.local/scripts/status/volume
index eedd657..4355094 100755
--- a/Scripts/.local/scripts/status/volume
+++ b/Scripts/.local/scripts/status/volume
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo "" $(pamixer --get-volume-human)
+echo "  $(pamixer --get-volume-human)"