feat: remove st

.local/bin/light

@@ -6,10 +6,10 @@ DIR="$(find /sys/class/backlight/* -print -quit)"
 CUR="$(cat "$DIR/brightness")"
 MAX=$(cat "$DIR/max_brightness")
 
-case "${1:0:1}" in
-    '')      echo "$CUR"; exit ;;
-    '+'|'-') CUR=$(((CUR / STEPS + $1) * STEPS)) ;;
-    *)       CUR="$1" ;;
+case "$1" in
+    +*|-*) CUR=$(((++CUR / STEPS + $1) * STEPS)) ;;
+    '') echo "$CUR"; exit ;;
+    *) CUR="$1" ;;
 esac
 
 if [ "$CUR" -lt 0 ]; then

.local/bin/sbar

@@ -25,18 +25,19 @@ sbat() {
 }
 
 svol() {
-    local st v m vol=('' ' ') mut=('🔇' ' ')
+    local st v m vol=('' ' ')
 
     mapfile -t st <<< "$(wpctl status | sed -n 's/.*\*.*\[vol: \(.*\)]/\1/p')"
-    if [ -z "${st[0]}" ]; then
-        return > vol
-    fi
     for i in "${!vol[@]}"; do
         read -r v m <<< "${st[$i]}"
+        if [ -z "$v" ]; then
+            break
+        fi
+        v="${vol[$i]} $((10#${v/./}))"
         if [ -n "$m" ]; then
-            echo -n "${mut[$i]}"
+            echo -n "${v//?/&$'\U0336'}"
         else
-            echo -n "${vol[$i]} $((10#${v/./}))"
+            echo -n "$v"
         fi
     done > vol
 }
@@ -85,20 +86,18 @@ stz() {
 }
 
 stime() {
-    # shellcheck disable=SC2238
-    TZ="$(cat tz)" date '+%a %m-%d %R%:::z' > time
+    TZ="$(cat tz)" date '+%a %m-%d %R%:::z' > 'time'
 }
 
 display() {
     for f in *; do
         local - "$f"="$(cat "$f")"
     done
-    # shellcheck disable=SC2128,SC2154
+    # shellcheck disable=SC2154
     xsetroot -name "$crypto | $cpu | $memory | $vol | $net$vpn | $bat | $time"
 }
 
-# TODO
-#trap 'kill -INT 0; wait' INT
+trap "kill 0" INT
 
 mkdir -p "$XDG_RUNTIME_DIR/sbar"
 cd "$XDG_RUNTIME_DIR/sbar" || exit 1
@@ -118,7 +117,7 @@ done &)
     svpn
     stime
     display
-    sleep $((5 - 10#$(date '+%S') % 5))
+    sleep $((5 - $(date '+%S') % 5))
 done &)
 
 while read -r _ _ f; do

.local/bin/vm

@@ -27,7 +27,7 @@ qemu-system-x86_64 \
     -audio   pipewire,model=hda \
     -nic     model=virtio-net-pci,type=user \
     -device  qemu-xhci \
-    -object  "memory-backend-ram,id=mem,size=$ram,share=on" \
+    -object  "memory-backend-ram,id=mem,size=2G,share=on" \
     -numa    node,memdev=mem \
     -drive   "if=virtio,file=$DISK" \
     -drive   "file=$ISO,media=cdrom,readonly=on" \

.local/bin/vol

@@ -6,28 +6,17 @@ case "$1" in
     *) exit 1 ;;
 esac
 
-update_vol() {
-    # shellcheck disable=SC2017
-    case "$1" in
-        +*|-*) CUR=$((CUR + $1 - CUR % $1 + CUR % $1 * 10 / $1 / 5 * $1)) ;;
-            *) CUR="$1" ;;
-    esac
-    wpctl set-volume -l 3 "$DEV" "$CUR%"
-}
-
 read -r _ CUR MUTE < <(wpctl get-volume "$DEV")
 CUR=$((10#${CUR/./}))
 
-if [ -z "$2" ]; then
-    echo "$CUR"
-    exit
-fi
-if [ "$2" == 'm' ] && [ -z "$MUTE" ]; then
-    wpctl set-mute "$DEV" 1
+if [ "$2" = m ]; then
+    wpctl set-mute "$DEV" toggle
 else
-    if [[ "$2" =~ [0-9] ]]; then
-        update_vol "$2"
-    fi
+    case "$2" in
+        +*|-*) wpctl set-volume -l 1.5 "$DEV" "$((CUR + $2))%" ;;
+        '') echo "$CUR${MUTE:+ $MUTE}"; exit ;;
+        *) wpctl set-volume "$DEV" "$2%" ;;
+    esac
     if [ -n "$MUTE" ]; then
         wpctl set-mute "$DEV" 0
     fi

.local/bin/vpn

@@ -7,20 +7,26 @@ if tty -s; then
     SUDO=sudo
 fi
 
-if [ "$EUID" != 0 ]; then
-    exec "$SUDO" env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" \
-        XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" "$BASH" -- "${BASH_SOURCE[0]}" "$@"
-fi
+d="$(mktemp -d)"
+# shellcheck disable=SC2064
+trap "rm -rf '$d'" EXIT
+touch "$d/"{1..2}
+
+CMD=()
+while read -r i; do
+    CMD+=("wg-quick down '$i'")
+done < <(ip -br link show type wireguard | awk '{print $1}')
 
 if [ "$1" != off ]; then
-    set -- "$(basename -s.conf "/etc/wireguard/$1"*.conf | "$DMENU")"
-    if ! wg | grep -q "$1"; then
-        wg-quick up "$1"
-    fi
+    CMD=(
+        "basename -s.conf '/etc/wireguard/$1'*.conf > '$d/1'"
+        "inotifywait -e close_write '$d/2'"
+        "${CMD[@]}"
+        "wg-quick up \"\$(cat '$d/2')\""
+    )
 fi
 
-while read -r i; do
-    wg-quick down "$i"
-done < <(ip -br link show type wireguard | awk "\$1 != \"$1\"{print \$1}")
+(inotifywait -e close_write "$d/1"; "$DMENU" < "$d/1" > "$d/2") &
+"$SUDO" bash -c "${CMD[*]/%/;}"
 
 touch "$XDG_RUNTIME_DIR/sbar/vpn"