Cleaned up some scripts

1 files changed, 11 insertions, 3 deletions

diff --git a/scripts/.local/bin/personal/bar/status b/scripts/.local/bin/personal/bar/status
index 10c33de..e6dbbb9 100755
--- a/scripts/.local/bin/personal/bar/status
+++ b/scripts/.local/bin/personal/bar/status
@@ -7,13 +7,13 @@ SEPARATOR=" "
 
 # default color button
 use() {
-  printf "%s^c%s^^b%s^ %s ^b%s^ %s ^b%s^" "$SEPARATOR" "$color0" "$color1" "$1" "$color2" "$2" "$color0"
+  printf "%s^c%s^^b%s^ %s ^b%s^ %s ^b%s^" "$SEPARATOR" "$background" "$color1" "$1" "$color9" "$2" "$background"
 }
 
 # show in specified color if specified condition is true
 usecolorif() {
   if [ "$3" = "1" ]; then
-    printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$color1" "$color0" "$1" "$color2" "$color0" "$2" "$color0"
+    printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$color1" "$background" "$1" "$color9" "$color0" "$2" "$background"
   else
     use "$1" "$2"
   fi
@@ -27,4 +27,12 @@ useif() {
 }
 
 # actual string
-echo "$(useif "" "$(updates read)")$(useif "" "$(volume)")$(use "" "$(lights)")$(usecolorif "ﴞ" "$(battery)" "$(battery condition)")$(useif "說" "$(network)")$(use "" "$(datetime time)")$(use "" "$(datetime date)")"
+echo "\
+$(useif "" "$(updates read)")\
+$(useif "󰍬" "$(mute shortstatus)")\
+$(useif "󰕾" "$(volume)")\
+$(useif "說" "$(network)")\
+$(use "󰘚" "$(load) | $(temp)")\
+$(use "󱐋" "$(battery)")\
+$(use "" "$(datetime)")\
+"