Updated scripts for Qubes 4.1

1 files changed, 11 insertions, 15 deletions

diff --git a/qubes-dwm-6.2/scripts/dwm_status b/qubes-dwm-6.2/scripts/dwm_status
index 9d806f0..cb12183 100755
--- a/qubes-dwm-6.2/scripts/dwm_status
+++ b/qubes-dwm-6.2/scripts/dwm_status
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 status_time() {
-    date '+%d/%Hh%M'
+    date '+%a %d/%Hh%M'
 }
 
 status_bat() {
-    local report=$(acpi | tr -d ',')
+    local report=$(acpi)
     echo $report | grep -qv Unknown
     if [ "$?" = "0" ]; then
-        local status=$(echo $report | cut -d\  -f 3 | cut -b 1)
-        local perc=$(echo $report | cut -d\  -f 4)
-        local time=$(echo $report | cut -d\  -f 5 | sed 's/\([0-9]*\):\([0-9]*\).*/\1h\2m/')
+	local status=$(echo $report | cut -d, -f1 | cut -d: -f2- | cut -b2)
+        local perc=$(echo $report | cut -d, -f2 | cut -b2-)
+	local time=$(echo $report | cut -d, -f3 | cut -b2- | sed 's/\([0-9]*\):\([0-9]*\).*/\1h\2m/')
         local output="$status$perc"
         if [ -n "$time" ]; then
             output="$output"" $time"
@@ -30,11 +30,7 @@ status_load() {
 
 status_temp() {
     local temp=$(( $(cat /sys/class/thermal/thermal_zone0/temp) / 1000 ))
-    if [ "$temp" -gt "60" ]; then
-        echo "$temp C | "
-    else
-        echo
-    fi
+    echo "T ${temp}C"
 }
 
 status_autolock() {
@@ -42,7 +38,7 @@ status_autolock() {
 }
 
 status_ram() {
-    xl info | awk '/free_memory/ { printf("%.2fG free", $3/1024) } '
+    xl info | awk '/free_memory/ { printf("R %.0fG", $3/1024) } '
 }
 
 status_qubes() {
@@ -71,7 +67,7 @@ status_disk() {
         *)
             disk="Error" ;;
     esac
-    echo "$disk"
+    echo "S $disk"
 }
 
 main() {
@@ -82,12 +78,12 @@ main() {
             local bat=$(status_bat)
             local time=$(status_time)
         fi
-        # local ram=$(status_ram)
-        # local disk=$(status_disk)
+        local ram=$(status_ram)
+        #local hdd=$(status_disk)
         local temp=$(status_temp)
         local qubes=$(status_qubes)
         local autolock=$(status_autolock)
-        local status="$autolock$qubes | $temp$bat | $time"
+        local status="$autolock$qubes | $ram $temp | $bat | $time"
         xsetroot -name "$status"
         sleep 30
     done