Update to status (now I use a statusbar)

7 files changed, 17 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index d4c07a4..b4872ac 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ PREFIX = /usr/local
 SCRIPTS =       addressgrep \
                 battery-checknow \
                 battery-status \
-                brightness \
                 clip \
                 config-backup \
                 cth \
@@ -19,7 +18,6 @@ SCRIPTS =       addressgrep \
                 ffmpeg-facecam \
                 mail-compose \
                 mergepdf \
-                notify-status \
                 open-file \
                 open-stdin \
                 open-url \
@@ -35,17 +33,16 @@ SCRIPTS =       addressgrep \
                 templess \
                 terminal \
                 theme \
-                togglemute \
                 translate \
                 trash \
                 urlgrep \
                 virename \
-                volume \
                 websearch \
                 xedit \
                 xedit-filter \
                 xplumb \
                 xprop-active-window-id \
+                xroot-update \
                 xwallpaper-random-notify
 
 all: install
diff --git a/brightness b/old/brightness
index a7294fb..a7294fb 100755
--- a/brightness
+++ b/old/brightness
diff --git a/notify-status b/old/notify-status
index 73a9435..73a9435 100755
--- a/notify-status
+++ b/old/notify-status
diff --git a/togglemute b/old/togglemute
index b799b02..b799b02 100755
--- a/togglemute
+++ b/old/togglemute
diff --git a/volume b/old/volume
index 8dcd36a..8dcd36a 100755
--- a/volume
+++ b/old/volume
diff --git a/status b/status
index 7a2825f..10b43f9 100755
--- a/status
+++ b/status
@@ -10,9 +10,15 @@
 
 sep=${1:-" | "}
 
-time=$(date +"%H:%M:%S")
+time=$(date +"%H:%M")
 date=$(date +"%d %B %Y, %A")
 
+if [ "$(pulsemixer --get-mute)" -eq 1 ]; then
+        volume="Audio muted"
+else
+        volume="Volume: $(pulsemixer --get-volume | awk '{print $1}')%%"
+fi
+
 bat="/sys/class/power_supply/BAT0"
 if [ -d $bat ]; then
         battery="Battery: $(cat $bat/capacity)%% $(cat $bat/status)"
@@ -28,6 +34,6 @@ network="Network: $(nmcli device status | head -n 2 | tail -n 1 | sed 's/ *$//'
 
 events=$(sdep-list past | wc -l)
 
-printf "$time$sep$date$sep$battery$sep$network"
+printf "$network$sep$volume$sep$battery$sep$date$sep$time"
 [ "$events" != "0" ] && printf "$sep$events TODO task(s)"
 printf "\n"
diff --git a/xroot-update b/xroot-update
new file mode 100755
index 0000000..44ab6c1
--- /dev/null
+++ b/xroot-update
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Updates the xroot window with info from status
+# Requires: status
+
+# Usage: xroot-update
+
+xsetroot -name " $(status) "