diff --git a/_suckless/_scripts/sb-mail b/_suckless/_scripts/sb-mail index 857d2a7..9adb541 100755 --- a/_suckless/_scripts/sb-mail +++ b/_suckless/_scripts/sb-mail @@ -13,4 +13,4 @@ for i in $(cat ~/.local/share/passwords); do [ $count -ne 0 ] && export unread=$((unread + count)) fi done -[ "$unread" -eq 0 ] && printf "" || printf "^c#ffffff^^b#005577^\uf7aa new mail: ${unread}^d^" +[ "$unread" -eq 0 ] && printf "" || printf "^c#ffffff^^b#005577^\uf7aa ${unread} new^d^" diff --git a/_suckless/_scripts/sb-network b/_suckless/_scripts/sb-network index 5d4aea4..1ae32e4 100755 --- a/_suckless/_scripts/sb-network +++ b/_suckless/_scripts/sb-network @@ -1,9 +1,8 @@ #!/bin/bash case "$(cat /sys/class/net/w*/operstate 2>/dev/null)" in - down) printf "^c#ffffff^^b#770000^no wifi^d^" ;; + down) printf " ^c#ffffff^^b#770000^ no wifi^d^" ;; up) [ -n "$(ip address show dev wlan0 | grep 'inet ')" ] \ - && printf "$(iw dev wlan0 info | grep 'ssid ' | cut -d' ' -f2-)" \ - || printf "^c#ffffff^^b#770000^no ip^d^" ;; + && printf "" || printf " ^c#ffffff^^b#770000^no ip^d^" ;; esac diff --git a/_suckless/_scripts/sb-volume b/_suckless/_scripts/sb-volume index 332f4b2..8230f3d 100755 --- a/_suckless/_scripts/sb-volume +++ b/_suckless/_scripts/sb-volume @@ -12,17 +12,17 @@ if [ "${1}" = "micmute" ]; then esac kill -46 $(pidof dwmblocks) else - vol=$(pactl get-sink-volume @DEFAULT_SINK@ | awk -F' / ' '{print $2}' | tr -d '%') mic=$(pactl get-source-volume @DEFAULT_SOURCE@ | awk -F' / ' '{print $2}' | tr -d '%') - volmute=$(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') + vol=$(pactl get-sink-volume @DEFAULT_SINK@ | awk -F' / ' '{print $2}' | tr -d '%') micmute=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') - if [ "$volmute" = yes ] && [ "$micmute" = yes ]; then + volmute=$(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') + if [ "$micmute" = yes ] && [ "$volmute" = yes ]; then printf "^c#ffffff^^b#770000^\uf131 mute | \ufa80 mute^d^" - elif [ "$vol" -eq 0 ] && [ "$mic" -eq 0 ]; then + elif [ "$mic" -eq 0 ] && [ "$vol" -eq 0 ]; then printf "^c#ffffff^^b#770000^\uf131 mute | \ufa80 mute^d^" else + [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micinfo="^c#ffffff^^b#770000^\uf131 mute | ^d^" || micinfo="" [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && volinfo="^c#ffffff^^b#770000^\ufa80 mute^d^" || volinfo="\uf028 ${vol}%%" - [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micinfo="^c#ffffff^^b#770000^\uf131 mute^d^" || micinfo="\uf130 ${mic}%%" - printf "${micinfo} | ${volinfo}" + printf "${micinfo}${volinfo}" fi fi diff --git a/_suckless/dwmblocks/blocks.h b/_suckless/dwmblocks/blocks.h index 043cf3d..f0f2d3b 100644 --- a/_suckless/dwmblocks/blocks.h +++ b/_suckless/dwmblocks/blocks.h @@ -1,12 +1,12 @@ //Modify this file to change what commands output to your statusbar, and recompile using the make command. static const Block blocks[] = { - /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ - {"", "sb-emerge", 1, 0 }, - {"", "sb-mail", 60, 16 }, - {"", "sb-volume", 0, 12 }, - {"\uf1eb ", "sb-network", 1, 0 }, - {"\uf241 ", "sb-battery", 3, 0 }, - {"\uf073 ", "date '+%F %I:%M:%S %p |'", 1, 0 }, + /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ + {"", "sb-emerge", 1, 0 }, + {"", "sb-mail", 60, 16 }, + {"", "sb-volume", 0, 12 }, + {"\uf1eb ", "sb-network", 1, 0 }, + {"\uf241 ", "sb-battery", 3, 0 }, + {"\uf073 ", "date '+[%e] %I:%M:%S %p |'", 1, 0 }, }; //sets delimeter between status commands. NULL character ('\0') means no delimeter.