diff --git a/_suckless/_scripts/sb-emerge b/_suckless/_scripts/sb-emerge index 4c60697..50ed8f8 100755 --- a/_suckless/_scripts/sb-emerge +++ b/_suckless/_scripts/sb-emerge @@ -1,3 +1,3 @@ #!/bin/bash -[ $(pgrep -x emerge) ] && printf "^c#ffffff^\ue20f ^c#ffffff^^b#9a37ff^emerge^d^" || printf "" +[ $(pgrep -x emerge) ] && printf "\ue20f ^c#ffffff^^b#9a37ff^emerge^d^" || printf "" diff --git a/_suckless/_scripts/sb-mail b/_suckless/_scripts/sb-mail index 857d2a7..e635ec3 100755 --- a/_suckless/_scripts/sb-mail +++ b/_suckless/_scripts/sb-mail @@ -9,8 +9,9 @@ for i in $(cat ~/.local/share/passwords); do count=$(curl -s --user "${user}:${pass}" https://mail.google.com/mail/feed/atom/ | grep -oPm1 "(?<=)[^<]+" | sed '1d' | wc -l 2>/dev/null) [ $count -ne 0 ] && export unread=$((unread + count)) if [ $user = 'ftpd@insomniac.pl' ]; then - count=$(curl -s --user "${user}:${pass}" https://mail.google.com/mail/feed/atom/sites | grep -oPm1 "(?<=<title>)[^<]+" | sed '1d' | wc -l 2>/dev/null) - [ $count -ne 0 ] && export unread=$((unread + count)) + scount=$(curl -s --user "${user}:${pass}" https://mail.google.com/mail/feed/atom/sites | grep -oPm1 "(?<=<title>)[^<]+" | sed '1d' | wc -l 2>/dev/null) + [ $scount -ne 0 ] && export unread=$((unread + scount)) fi done -[ "$unread" -eq 0 ] && printf "" || printf "^c#ffffff^^b#005577^\uf7aa new mail: ${unread}^d^" +[ "$unread" -ne 0 ] && printf "\uf7aa ^c#ffffff^^b#005577^new mail: ${unread}^d^" + diff --git a/_suckless/_scripts/sb-network b/_suckless/_scripts/sb-network index 7da42b1..5d4aea4 100755 --- a/_suckless/_scripts/sb-network +++ b/_suckless/_scripts/sb-network @@ -1,7 +1,7 @@ #!/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-)" \ diff --git a/_suckless/_scripts/sb-vol-in b/_suckless/_scripts/sb-vol-in index c0a8d29..1dcd728 100755 --- a/_suckless/_scripts/sb-vol-in +++ b/_suckless/_scripts/sb-vol-in @@ -13,5 +13,5 @@ if [ "${1}" = "micmute" ]; then kill -44 $(pidof dwmblocks) else mic=$(pactl get-source-volume @DEFAULT_SOURCE@ | awk -F' / ' '{print $2}' | tr -d '%') - [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && printf "^c#ffffff^\uf131 ^c#ffffff^^b#770000^mute^d^" + [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && printf "\uf131 ^c#ffffff^^b#770000^mute^d^" fi diff --git a/_suckless/_scripts/sb-vol-out b/_suckless/_scripts/sb-vol-out index c84facb..89221b7 100755 --- a/_suckless/_scripts/sb-vol-out +++ b/_suckless/_scripts/sb-vol-out @@ -1,4 +1,4 @@ #!/bin/bash vol=$(pactl get-sink-volume @DEFAULT_SINK@ | awk -F' / ' '{print $2}' | tr -d '%') -[ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && printf "^c#ffffff^\ufa80 ^c#ffffff^^b#770000^mute^d^" || printf "^c#ffffff^\uf028 ^d^${vol}%%" +[ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && printf "^c#ffffff^^b#770000^mute^d^" || printf "${vol}%%" diff --git a/_suckless/dwmblocks/blocks.h b/_suckless/dwmblocks/blocks.h index b2fa1ad..d264e1e 100644 --- a/_suckless/dwmblocks/blocks.h +++ b/_suckless/dwmblocks/blocks.h @@ -1,13 +1,13 @@ //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-vol-in", 0, 10 }, - {"", "sb-vol-out", 0, 12 }, - {"^c#ffffff^\uf241 ^d^", "sb-battery", 3, 0 }, - {"^c#ffffff^\uf1eb ^d^", "sb-network", 1, 0 }, - {"^c#ffffff^\uf073 ^d^", "date '+[%e] %I:%M:%S %p |'", 1, 0 }, + /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ + {"", "sb-emerge", 1, 0 }, + {"", "sb-mail", 60, 16 }, + {"", "sb-vol-in", 0, 10 }, + {"\uf028 ", "sb-vol-out", 0, 12 }, + {"\uf241 ", "sb-battery", 3, 0 }, + {"\uf1eb ", "sb-network", 1, 0 }, + {"\uf073 ", "date '+[%e] %I:%M:%S %p |'", 1, 0 }, }; //sets delimeter between status commands. NULL character ('\0') means no delimeter.