.local/bin/etc/statusbar/battery

@@ -16,45 +16,20 @@ if [ "$status" = "Discharging" ] && [ $capacity -le 15 ] ; then
         notify-send -u critical "Battery" "Below 15%"
 fi
 
-if [ $capacity -gt 40 ]
-then
-    color="^b#282828^^c#dfdfdf^"
-elif [ $capacity -gt 20 ]
-then
-    color="^b#282828^^c#ffff00^"
-else
-    color="^b#282828^^c#ff0000^"
-fi
-
 case "$status" in
     "Discharging")
-        if [ $capacity -gt 75 ]
-        then
-            icon=""
-        elif [ $capacity -gt 60 ]
-        then
-            icon=""
-        elif [ $capacity -gt 40 ]
-        then
-            icon=""
-        elif [ $capacity -gt 20 ]
-        then
-            icon=""
-        else
-            icon=""
-        fi
-        ;;
+        icon="^b#282828^^c#dfdfdf^  ^d^";;
     "Not charging")
-        icon="";;
+        icon="^b#282828^^c#dfdfdf^  ^d^";;
     "Charging")
-        icon="";;
+        icon="^b#282828^^c#dfdfdf^  ^d^";;
     "Unknown")
-        icon="";;
+        icon="^b#282828^^c#dfdfdf^  ^d^";;
     "Full")
-        icon="⚡";;
+        icon="^b#282828^^c#dfdfdf^ ⚡ ^d^";;
 esac
 
 capacity=$(echo "$capacity" | sed -e 's/$//')
 capacity=$(printf %3s $capacity | tr ' ' ' ')
 
-echo "$color $icon ^d^"
+echo "$icon $capacity%"

.local/bin/etc/statusbar/cpu

@@ -12,12 +12,12 @@ temp=$(printf %3s $(echo ${temp##*+} | sed "s/\..*//") | tr ' ' ' ')
 
 if [ $temp -gt 100 ]
 then
-    icon="^b#282828^^c#ff0000^ "
+    icon="^b#282828^^c#ff0000^  ^d^"
 elif [ $temp -gt 80 ]
 then
-    icon="^b#282828^^c#ffff00^ "
+    icon="^b#282828^^c#ffff00^  ^d^"
 else
-    icon="^b#282828^^c#dfdfdf^ "
+    icon="^b#282828^^c#dfdfdf^  ^d^"
 fi
 
 echo "$icon"

.local/bin/etc/statusbar/gpu

@@ -14,12 +14,12 @@ fi
 
 if [ $temp -gt 100 ]
 then
-    icon="^b#282828^^c#ff0000^ "
+    icon="^b#282828^^c#ff0000^  ^d^"
 elif [ $temp -gt 80 ]
 then
-    icon="^b#282828^^c#ffff00^ "
+    icon="^b#282828^^c#ffff00^  ^d^"
 else
-    icon="^b#282828^^c#dfdfdf^ "
+    icon="^b#282828^^c#dfdfdf^  ^d^"
 fi
 
 echo "$icon"

.local/bin/etc/statusbar/internet

@@ -12,12 +12,12 @@ if [ $wifistatus = "up" ]
 then
     if [ $wifipercent -gt 75 ]
     then
-        wifiicon="^c#dfdfdf^ ^d^"
+        wifiicon=" ^d^"
     elif [ $wifipercent -gt 40 ]
     then
-        wifiicon="^c#ffff00^ ^d^"
+        wifiicon=" ^d^"
     else
-        wifiicon="^c#ff0000^ ^d^"
+        wifiicon=" ^d^"
     fi
 fi
 

.local/bin/etc/statusbar/memory

@@ -6,12 +6,12 @@ percent=$(printf %3s $(printf %-4s $total | tr ' ' '0' | cut -c1-4 | sed -e 's/\
 
 if [ $percent -gt 75 ]
 then
-    icon="^b#282828^^c#ff0000^ "
+    icon="^b#282828^^c#ff0000^  ^d^"
 elif [ $percent -gt 50 ]
 then
-    icon="^b#282828^^c#ffff00^ "
+    icon="^b#282828^^c#ffff00^  ^d^"
 else
-    icon="^b#282828^^c#dfdfdf^ "
+    icon="^b#282828^^c#dfdfdf^  ^d^"
 fi
 
 echo "$icon"

.local/bin/etc/statusbar/volume

@@ -2,12 +2,10 @@
 
 vol="$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print $2}' | sed -e 's/\.//g' | sed 's/^0*//')"
 
-if [ "$vol" -gt "100" ]; then
-	vol_info="^c#ffff00^  "
+if [ "$vol" -eq "0" ]; then
+	vol_info="^c#dfdfdf^  "
 elif [ "$vol" -gt "70" ]; then
 	vol_info="^c#dfdfdf^  "
-elif [ "$vol" -eq "0" ]; then
-	vol_info="^c#dfdfdf^  "
 else
 	vol_info="^c#dfdfdf^  "
 fi
@@ -21,4 +19,4 @@ else
 fi
 
 vol=$(printf %3s $vol | tr ' ' ' ')
-printf "^b#282828^%s%s^d^" "$mic" "$vol_info"
+printf "^b#282828^%s%s^d^ %s" "$mic" "$vol_info" "$vol%"