10 files changed, 73 insertions, 51 deletions
diff --git a/scripts/.local/bin/personal/bar/battery b/scripts/.local/bin/personal/bar/battery
index 53c1cb0..151202e 100755
--- a/scripts/.local/bin/personal/bar/battery
+++ b/scripts/.local/bin/personal/bar/battery
@@ -1,27 +1,14 @@
 #!/bin/bash
 
-percent="$(acpi | awk '{print $4}')"
-state="$(acpi | awk '{print $3}')"
-time="$(acpi | awk '{print $5}')"
+acpireport="$(acpi | grep -v unavailable | head -n 1)"
 
-state0=""
-state1=""
-state2=""
-state3=""
-state4=""
+percent="$(echo $acpireport | awk '{print $4}')"
+state="$(echo $acpireport | awk '{print $3}')"
+time="$(echo $acpireport | awk '{print $5}')"
 
-if [[ "$1" = "condition" ]]; then
-  if ((${percent::-2} <= 10)) ; then
-    echo "1"
-  else
-    echo "0"
-  fi
-
-  exit 0
-fi
-
-if [ "${state::-1}" == "Discharging" ]; then
-  echo "${percent::-1} (${time::-3} ↓)"
+if [[ "${state::-1}" == "Discharging" ]]; then
+  echo "${percent::-1} | ${time::-3} ↓"
 else 
-  echo "${percent::-1} (${time::-3} ↑)"
+  echo "${percent::-1} | ${time::-3} ↑"
 fi
+
diff --git a/scripts/.local/bin/personal/bar/brightness b/scripts/.local/bin/personal/bar/brightness
index 681c846..c1a117e 100755
--- a/scripts/.local/bin/personal/bar/brightness
+++ b/scripts/.local/bin/personal/bar/brightness
@@ -4,8 +4,11 @@
 # Depends on: bash, brightnessctl
 # By David Penkowoj, 2021/06/24
 
-MTR_VALUE=19
-KBD_VALUE=2
+# MTR_DEVICE="$MTR_DEVICE"
+MTR_DEVICE="acpi_video0"
+KBD_DEVICE="smc::kbd_backlight"
+MTR_VALUE=75
+KBD_VALUE=0
 
 SWITCH="$1"
 
@@ -22,46 +25,50 @@ case $SWITCH in
     printf "status    - show brightness of a device"
     ;;
   "load")
-    brightnessctl --device='intel_backlight' set "$MTR_VALUE%"
-    brightnessctl --device='smc::kbd_backlight' set 0 # "$KBD_VALUE%"
+    brightnessctl --device="$MTR_DEVICE" set "$MTR_VALUE%"
+    brightnessctl --device="$KBD_DEVICE" set 0 # "$KBD_VALUE%"
     ;;
   "save")
-    M="$(brightnessctl --device='intel_backlight' | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
-    K="$(brightnessctl --device='smc::kbd_backlight' | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
+    M="$(brightnessctl --device="$MTR_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
+    K="$(brightnessctl --device="$KBD_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
     sed -i "s/MTR_VALUE=$MTR_VALUE/MTR_VALUE=$M/g" "$0"
     sed -i "s/KBD_VALUE=$KBD_VALUE/KBD_VALUE=$K/g" "$0"
     ;;
   "smalldown")
-    if [[ "$2" = "monitor" ]]; then brightnessctl --device='intel_backlight' set 1-%; fi
-    if [[ "$2" = "keyboard" ]]; then brightnessctl --device='smc::kbd_backlight' set 1-%; fi
+    if [[ "$2" = "monitor" ]]; then brightnessctl --device="$MTR_DEVICE" set 1-%; fi
+    if [[ "$2" = "keyboard" ]]; then brightnessctl --device="$KBD_DEVICE" set 1-%; fi
     brightness save
+    notify-send -u low -r "110" "$2: $(brightness get monitor)"
     ;;
   "smallup")
-    if [[ "$2" = "monitor" ]]; then brightnessctl --device='intel_backlight' set +1%; fi
-    if [[ "$2" = "keyboard" ]]; then brightnessctl --device='smc::kbd_backlight' set +1%; fi
+    if [[ "$2" = "monitor" ]]; then brightnessctl --device="$MTR_DEVICE" set +1%; fi
+    if [[ "$2" = "keyboard" ]]; then brightnessctl --device="$KBD_DEVICE" set +1%; fi
     brightness save
+    notify-send -u low -r "110" "$2: $(brightness get monitor)"
     ;;
   "down")
-    if [[ "$2" = "monitor" ]]; then brightnessctl --device='intel_backlight' set 5-%; fi
-    if [[ "$2" = "keyboard" ]]; then brightnessctl --device='smc::kbd_backlight' set 5-%; fi
+    if [[ "$2" = "monitor" ]]; then brightnessctl --device="$MTR_DEVICE" set 5-%; fi
+    if [[ "$2" = "keyboard" ]]; then brightnessctl --device="$KBD_DEVICE" set 5-%; fi
     brightness save
+    notify-send -u low -r "110" "$2: $(brightness get monitor)"
     ;;
   "up")
-    if [[ "$2" = "monitor" ]]; then brightnessctl --device='intel_backlight' set +5%; fi
-    if [[ "$2" = "keyboard" ]]; then brightnessctl --device='smc::kbd_backlight' set +5%; fi
+    if [[ "$2" = "monitor" ]]; then brightnessctl --device="$MTR_DEVICE" set +5%; fi
+    if [[ "$2" = "keyboard" ]]; then brightnessctl --device="$KBD_DEVICE" set +5%; fi
     brightness save
+    notify-send -u low -r "110" "$2: $(brightness get monitor)"
     ;;
   "get")
-    M="$(brightnessctl --device='intel_backlight' | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
-    K="$(brightnessctl --device='smc::kbd_backlight' | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
+    M="$(brightnessctl --device="$MTR_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
+    K="$(brightnessctl --device="$KBD_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)"
     if [[ "$2" = "monitor" ]]; then echo "$M%"; fi
     if [[ "$2" = "keyboard" ]]; then echo "$K%"; fi
     ;;
   *)
     printf "Monitor:\n"
-    brightnessctl --device='intel_backlight' | tail -n 3 | sed 's/\t/- /g'
+    brightnessctl --device="$MTR_DEVICE" | tail -n 3 | sed 's/\t/- /g'
     printf "Keyboard:\n"
-    brightnessctl --device='smc::kbd_backlight' | tail -n 3 | sed 's/\t/- /g'
+    brightnessctl --device="$KBD_DEVICE" | tail -n 3 | sed 's/\t/- /g'
     ;;
 esac
 
diff --git a/scripts/.local/bin/personal/bar/datetime b/scripts/.local/bin/personal/bar/datetime
index 31f2144..d11713b 100755
--- a/scripts/.local/bin/personal/bar/datetime
+++ b/scripts/.local/bin/personal/bar/datetime
@@ -5,5 +5,5 @@ if [ "$1" = "date" ]; then
 elif [ "$1" = "time" ]; then
   echo "$(date '+%H:%M %Z')"
 else
-  echo "$(date '+%a. %Y-%m-%d %H:%M %Z')"
+  echo "$(date '+%a. %Y-%m-%d | %H:%M %Z')"
 fi
diff --git a/scripts/.local/bin/personal/bar/inputlang b/scripts/.local/bin/personal/bar/inputlang
new file mode 100755
index 0000000..810ba0f
--- /dev/null
+++ b/scripts/.local/bin/personal/bar/inputlang
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+langstring="$(fcitx5-remote -n)"
+
+case $SWITCH in
+  "keyboard-de")
+    echo "DE"
+    ;;
+  "keyboard-de-ru")
+    echo "RU"
+    ;;
+  "kkc")
+    echo "JA"
+    ;;
+  *)
+    echo "OS" # meaning oh sht
+    ;;
+esac
diff --git a/scripts/.local/bin/personal/bar/load b/scripts/.local/bin/personal/bar/load
index dec7f60..706ae91 100755
--- a/scripts/.local/bin/personal/bar/load
+++ b/scripts/.local/bin/personal/bar/load
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/dash
 
 grep 'cpu ' /proc/stat | awk '{cpu_usage=($2+$4)*100/($2+$4+$5)} {printf "%0.2f%", cpu_usage}'
 printf "\n"
diff --git a/scripts/.local/bin/personal/bar/music b/scripts/.local/bin/personal/bar/music
index 54104b0..f425553 100755
--- a/scripts/.local/bin/personal/bar/music
+++ b/scripts/.local/bin/personal/bar/music
@@ -5,7 +5,7 @@ NAME="$(mpc current | xargs -i basename '{}')"
 VOLUME="$(mpc volume | awk '{print $2}')"
 
 if [[ -n "$STATE" ]]; then
-  echo "MPD Playing: ${NAME%.*} ($VOLUME)"
+  echo "Currently playing: ${NAME%.*} ($VOLUME)"
 else
   echo "MPD Paused"
 fi
diff --git a/scripts/.local/bin/personal/bar/mute b/scripts/.local/bin/personal/bar/mute
index 1103c0e..834618a 100755
--- a/scripts/.local/bin/personal/bar/mute
+++ b/scripts/.local/bin/personal/bar/mute
@@ -6,9 +6,9 @@ if [[ "$1" == "shortstatus" ]]; then
   VOLUME="$(pactl get-source-volume "$SOURCE" | grep -o [0-9]*%)"
 
   if [[ "$VOLUME" == "0%" ]]; then
-    echo "OFF"
+    echo "Muted"
   else
-    echo "ON"
+    echo ""
   fi
 
   exit
@@ -25,7 +25,9 @@ fi
 
 if [[ "$(pactl get-source-volume $SOURCE | grep -o [0-9]*%)" == "0%" ]]; then
   pactl set-source-volume "$SOURCE" 70%
+  notify-send -u low "Unmuted" -r 110
 else
   pactl set-source-volume "$SOURCE" 0%
+  notify-send -u low "Muted" -r 110
 fi
 
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)")\
+"
diff --git a/scripts/.local/bin/personal/bar/temp b/scripts/.local/bin/personal/bar/temp
index 4a9589f..c4c19bb 100755
--- a/scripts/.local/bin/personal/bar/temp
+++ b/scripts/.local/bin/personal/bar/temp
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/dash
 
-echo "$(sensors | grep "Package id 0:" | awk '{print $4}')"
+echo "$(sensors | grep "Package id 0:" | awk '{print $4}' | sed 's/+//g')"
diff --git a/scripts/.local/bin/personal/bar/updates b/scripts/.local/bin/personal/bar/updates
index c0a3f4a..9db1bff 100755
--- a/scripts/.local/bin/personal/bar/updates
+++ b/scripts/.local/bin/personal/bar/updates
@@ -1,6 +1,6 @@
-#!/bin/dash
+#!/bin/bash
 
-storage=0
+storage=29
 
 if [ "$1" = "read" ]; then
   if [ "$storage" != "0" ]; then