3 files changed, 5 insertions, 46 deletions

diff --git a/notify b/notify
index 48b7eee..38e1793 100755
--- a/notify
+++ b/notify
@@ -17,7 +17,7 @@ usage() {
 touch "$file"
 case "$1" in 
         push)
-                echo "(Notified $date) $2" >> "$file"
+                echo "[$date $2]" >> "$file"
                 $update
                 ;;
         clean)
diff --git a/status-alpine b/status-alpine
deleted file mode 100755
index fcc4c28..0000000
--- a/status-alpine
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Prints some status info to stdout. Includes:
-#       - date and time
-#       - battery
-#       - wifi (requires nmcli)
-#       - past notifications (requires notify)
-
-# Usage: status [separator]
-
-sep=${1:-" | "}
-
-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)"
-else
-        battery="No battery"
-fi
-
-# NetworkManager has a dreadful command line interface
-# It makes cry every time
-# pls help
-nwline="$(nmcli device status | head -n 2 | tail -n 1)"
-nwclean="$(echo "$nwline" | sed 's/ *$//' | sed 's/.*  //')"
-network="Network: $nwclean"
-
-noticount=$(notify show | wc -l)
-
-printf '%s' "$network$sep$volume$sep$battery$sep$date$sep$time"
-[ "$noticount" = "1" ] && printf '%s' "$sep$(notify show)"
-[ "$noticount" -gt "1" ] && printf '%s' "${sep}Unread items: $noticount"
-printf '\n'
diff --git a/status-linux b/status-linux
index 8d507c5..d881228 100755
--- a/status-linux
+++ b/status-linux
@@ -11,10 +11,10 @@
 sep=${1:-" | "}
 
 time=$(date +"%H:%M")
-date=$(date +"%d %B %Y, %A")
+date=$(date +"%a %d %b")
 
 if [ "$(pulsemixer --get-mute)" -eq 1 ]; then
-        volume="Audio muted"
+        volume="Muted"
 else
         volume="Vol: $(pulsemixer --get-volume | awk '{print $1}')%"
 fi
@@ -35,11 +35,11 @@ fi
 #network="Network: $nwclean"
 
 # Thank you iwctl for saving us from this dreadful existence
-network="WiFi: $(iwctl station wlan0 show | grep 'Connected network' | awk '{print $3}')"
+network="$(iwctl station wlan0 show | grep 'Connected network' | awk '{print $3}')"
 
 noticount=$(notify show | wc -l)
 
 printf '%s' "$network$sep$volume$sep$battery$sep$date$sep$time"
 [ "$noticount" = "1" ] && printf '%s' "$sep$(notify show)"
-[ "$noticount" -gt "1" ] && printf '%s' "${sep}Unread items: $noticount"
+[ "$noticount" -gt "1" ] && printf '%s' "${sep} [$noticount]"
 printf '\n'