5 files changed, 16 insertions, 18 deletions
diff --git a/scripts/.local/bin/personal/bar/brightness b/scripts/.local/bin/personal/bar/brightness
index c1a117e..b54de59 100755
--- a/scripts/.local/bin/personal/bar/brightness
+++ b/scripts/.local/bin/personal/bar/brightness
@@ -7,7 +7,7 @@
 # MTR_DEVICE="$MTR_DEVICE"
 MTR_DEVICE="acpi_video0"
 KBD_DEVICE="smc::kbd_backlight"
-MTR_VALUE=75
+MTR_VALUE=99
 KBD_VALUE=0
 
 SWITCH="$1"
diff --git a/scripts/.local/bin/personal/bar/mute b/scripts/.local/bin/personal/bar/mute
index 834618a..7c987a2 100755
--- a/scripts/.local/bin/personal/bar/mute
+++ b/scripts/.local/bin/personal/bar/mute
@@ -2,9 +2,10 @@
 
 SOURCE="alsa_input.usb-R__DE_Microphones_R__DE_NT-USB_Mini_610BAACA-00.mono-fallback"
 
-if [[ "$1" == "shortstatus" ]]; then
-  VOLUME="$(pactl get-source-volume "$SOURCE" | grep -o [0-9]*%)"
+SOURCE="$(pactl get-default-source)"
+VOLUME="$(pactl get-source-volume "$SOURCE" | grep -o [0-9]*% | head -n 1)"
 
+if [[ "$1" == "shortstatus" ]]; then
   if [[ "$VOLUME" == "0%" ]]; then
     echo "Muted"
   else
@@ -16,14 +17,13 @@ fi
 
 if [[ "$1" == "status" ]]; then
   NAME="$(pactl list sources | grep -o Description:.* | sed -n 's/Description: //g;2p')"
-  VOLUME="$(pactl get-source-volume "$SOURCE" | grep -o [0-9]*%)"
 
   echo "$NAME ($VOLUME)"
 
   exit
 fi
 
-if [[ "$(pactl get-source-volume $SOURCE | grep -o [0-9]*%)" == "0%" ]]; then
+if [[ "$VOLUME" == "0%" ]]; then
   pactl set-source-volume "$SOURCE" 70%
   notify-send -u low "Unmuted" -r 110
 else
diff --git a/scripts/.local/bin/personal/bar/network b/scripts/.local/bin/personal/bar/network
index 915d482..10b156a 100755
--- a/scripts/.local/bin/personal/bar/network
+++ b/scripts/.local/bin/personal/bar/network
@@ -2,12 +2,8 @@
 
 ssid="$(nmcli device show | grep "GENERAL.CONNECTION" -m 1 | awk '{print $2}')"
 
-if [ -n "$ssid" ]; then 
-  if [ "$ssid" = "--" ]; then
-    echo ""
-  else
-    echo "$ssid"
-  fi
+if [ -n "$ssid" ] && [ "$ssid" != "--" ]; then
+  echo "$ssid"
 else
-  echo "..."
+  echo "."
 fi
diff --git a/scripts/.local/bin/personal/bar/status b/scripts/.local/bin/personal/bar/status
index e6dbbb9..da46bf0 100755
--- a/scripts/.local/bin/personal/bar/status
+++ b/scripts/.local/bin/personal/bar/status
@@ -1,5 +1,7 @@
 #!/bin/dash
 
+# echo 0; exit 0
+
 # loads colors
 . ~/.cache/wal/colors.sh
 
@@ -7,13 +9,13 @@ SEPARATOR=" "
 
 # default color button
 use() {
-  printf "%s^c%s^^b%s^ %s ^b%s^ %s ^b%s^" "$SEPARATOR" "$background" "$color1" "$1" "$color9" "$2" "$background"
+  printf "%s^c%s^^b%s^ %s ^b%s^ %s ^b%s^" "$SEPARATOR" "$background" "$primary" "$1" "$accent" "$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" "$background" "$1" "$color9" "$color0" "$2" "$background"
+    printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$primary" "$background" "$1" "$accent" "$background" "$2" "$background"
   else
     use "$1" "$2"
   fi
@@ -28,11 +30,11 @@ useif() {
 
 # actual string
 echo "\
-$(useif "" "$(updates read)")\
+$(useif "󰇚" "$(updates read)")\
 $(useif "󰍬" "$(mute shortstatus)")\
 $(useif "󰕾" "$(volume)")\
-$(useif "說" "$(network)")\
+$(useif "󰒢" "$(network)")\
 $(use "󰘚" "$(load) | $(temp)")\
 $(use "󱐋" "$(battery)")\
-$(use "" "$(datetime)")\
+$(use "󰃭" "$(datetime)")\
 "
diff --git a/scripts/.local/bin/personal/bar/updates b/scripts/.local/bin/personal/bar/updates
index 9db1bff..dc137d3 100755
--- a/scripts/.local/bin/personal/bar/updates
+++ b/scripts/.local/bin/personal/bar/updates
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-storage=29
+storage=0
 
 if [ "$1" = "read" ]; then
   if [ "$storage" != "0" ]; then