diff --git a/os/arch/.config/panel/lemons/mail b/os/arch/.config/panel/lemons/mail index 81b00560..98963a00 100755 --- a/os/arch/.config/panel/lemons/mail +++ b/os/arch/.config/panel/lemons/mail @@ -7,11 +7,9 @@ if [[ ! -f ~/.private/config/email.conf ]]; then exit 1 fi -. ~/.private/config/email.conf +. $HOME/.private/config/email.conf . $CWD/../panel-config -ICON_MAIL="" - get_mail() { local feed=$(curl -u "$1:$2" --silent https://mail.google.com/mail/feed/atom) if [[ "${feed//\/}" != "$feed" ]]; then @@ -35,7 +33,7 @@ icon="${ICON_MAIL}" color="${COLOR_FG}" case $num in [1-9]*) - icon="$icon$num" + icon="$icon $num" lastnum=$(cat "$mailtmp") if [[ $num != $lastnum ]]; then echo "$num" > "$mailtmp" diff --git a/os/arch/.config/panel/lemons/updates b/os/arch/.config/panel/lemons/updates index a75086ac..dd6e386f 100755 --- a/os/arch/.config/panel/lemons/updates +++ b/os/arch/.config/panel/lemons/updates @@ -15,7 +15,7 @@ if [ "$num" -gt 0 ]; then aplay -N -q /usr/share/sounds/ding.wav fi fi - echo "U%{F${COLOR_2}}$ICON_UPD$num%{F-}" + echo "U%{F${COLOR_2}}$ICON_UPD $num%{F-}" else echo "U%{F${COLOR_DIM}}$ICON_UPD%{F-}" fi diff --git a/os/arch/.config/panel/lemons/volume b/os/arch/.config/panel/lemons/volume index 83c719b5..c009e97a 100755 --- a/os/arch/.config/panel/lemons/volume +++ b/os/arch/.config/panel/lemons/volume @@ -1,8 +1,7 @@ #!/usr/bin/env dash -# I expect all volume adjustments to be done through the volume.sh script (in -# os/arch/bin), which will inform lemonbar of changes, so we only need to intialize -# volume once here. +# I expect all volume adjustments to be done through vol.sh (in os/arch/bin), which will +# inform lemonbar of changes, so we only need to intialize volume once here. . $(dirname $0)/../panel-config @@ -11,10 +10,9 @@ vol=0 if echo "$data" | grep '\[on\]' >/dev/null; then vol=$(echo "$data" | sed -n 's/^.*\[\([0-9]\+\)%.*$/\1/p' | uniq) case $vol in - 0) echo "V${ICON_MUTED}" - ;; - *) echo "V${ICON_SPEAKER}" - ;; + 0) echo "V${ICON_MUTED} " ;; + [1-7]|[1-7][0-9]) echo "V${ICON_SPEAKER_LOW} " ;; + *) echo "V${ICON_SPEAKER}" ;; esac else echo "V%{F${COLOR_DIM}}${ICON_MUTED}%{F-}"