Latest updates to DE

bin/bar_bat.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 #First we get the capacity
-charge=$(cat /sys/class/power_supply/BAT0/capacity)
+bat=$1
+charge=$(cat /sys/class/power_supply/$bat/capacity)
 
 #Now get the status 
-bstat=$(cat /sys/class/power_supply/BAT0/status)
+bstat=$(cat /sys/class/power_supply/$bat/status)
 
 #Get the symbol for the capacity
 if [ "$bstat" = "Charging" ]; then 
@@ -14,49 +15,19 @@ else
 fi
 if [ "$charge" -gt 90 ]; then 
     bat="$cstat"
+    charge=""
 elif [ "$charge" -gt 70 ]; then 
     bat="$cstat"
+    charge=""
 elif [ "$charge" -gt 50 ]; then 
     bat="$cstat"
+    charge=""
 elif [ "$charge" -gt 20 ]; then 
     bat="$cstat"
+    charge=""
 else
     bat="	$cstat"
+    charge=" $charge%"
 fi
 
-
-
-
-battery="$bat  $charge%"
-
-if [ -d /sys/class/power_supply/BAT1 ]; then 
-
-    #First we get the capacity
-    charge=$(cat /sys/class/power_supply/BAT1/capacity)
-
-    #Now get the status 
-    bstat=$(cat /sys/class/power_supply/BAT1/status)
-    if [ "$bstat" = "Charging" ]; then 
-        cstat=""
-    else
-        cstat=""
-    fi
-    #Get the symbol for the capacity
-    if [ "$charge" -gt 90 ]; then 
-        bat="$cstat"
-    elif [ "$charge" -gt 70 ]; then 
-        bat="$cstat"
-    elif [ "$charge" -gt 50 ]; then 
-        bat="$cstat"
-    elif [ "$charge" -gt 20 ]; then 
-        bat="$cstat"
-    else
-        bat="	$cstat"
-    fi
-
-    echo "$bat  $charge%
 $battery
"
-else
-    echo $battery
-fi
-
-
+echo "$bat$charge "

bin/bar_mem.sh

@@ -6,10 +6,10 @@ total=$(grep -oP '^MemTotal: *\K[0-9]+' /proc/meminfo)
 mem=" $(echo "scale=1; 100*($total-$available)/$total"| bc | cut -d '.' -f1 )"
 
 if [ $mem -gt 80 ]; then 
-    mem="	$mem"
+    mem="	$mem %"
 elif [ $mem -gt 50 ]; then 
-    mem="$mem"
+    mem="$mem %"
 else
-    mem="$mem"
+    mem=" "
 fi 
-echo "$mem%
"
+echo "$mem
"

bin/bar_volume.sh

@@ -3,12 +3,16 @@
 
 vol="$(pamixer --get-volume)"
 
-if [ "$vol" -gt "70" ]; then 
+#if [ "$vol" -gt "70" ]; then 
+#    icon="󰕾"
+#elif [ "$vol" -gt "30" ]; then 
+#    icon="󰖀"
+#el
+
+if [ "$vol" -gt "0" ]; then
     icon="󰕾"
-elif [ "$vol" -gt "30" ]; then 
-    icon="󰖀"
 else
-    icon="󰕿"
+    icon=""
 fi
 
-echo "$icon $vol%
"
+echo "$icon 
"

bin/bar_wifi.sh

@@ -4,5 +4,5 @@ case "$(cat /sys/class/net/w*/operstate 2>/dev/null)" in
     down) echo "	󰖪 
";;
     up) percentage="$(awk '/^\s*w/ { print int($3 * 100 / 70) "% " }' /proc/net/wireless)"
         ssid=$(iwgetid -r)
-        echo \   $ssid 

+        echo " 
"
 esac

bin/search

@@ -5,5 +5,5 @@ query=$(eval "$dmenu")
 if [ -n "$query" ]; then
     query=${query//+/%2B}
     query=${query// /+}
-    ~/.local/bin/zen-x86_64.AppImage --new-window "https://search.brave.com/search?q=$query"
+    zen-browser --new-window "https://search.brave.com/search?q=$query"
 fi

bin/volume.sh

@@ -68,3 +68,5 @@ case $1 in
     fi
     ;;
 esac
+
+kill -44 $(pidof dwmblocks)