From 07bcbdd8d3aad5355e149e3aedc992391f859b38 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Sun, 20 Feb 2022 03:24:37 +0100 Subject: [PATCH] Show mic volume on statusbar. --- _suckless/_scripts/sb-volume | 8 +++++--- _suckless/dwm/config.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/_suckless/_scripts/sb-volume b/_suckless/_scripts/sb-volume index aba7ce9..c544b5e 100755 --- a/_suckless/_scripts/sb-volume +++ b/_suckless/_scripts/sb-volume @@ -17,10 +17,12 @@ else volmute=$(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') micmute=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') if [ "$volmute" = yes ] && [ "$micmute" = yes ]; then - printf "^c#161616^^b#fd4285^\ue02b mute \ue04f mute^d^" + printf "^c#161616^^b#fd4285^mute \ue02b mute \ue04f^d^" + elif [ "$vol" -eq 0 ] && [ "$mic" -eq 0 ]; then + printf "^c#161616^^b#fd4285^mute \ue02b mute \ue04f^d^" else - [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] && volinfo="^c#161616^^b#fd4285^mute \ue04f^d^" || volinfo="${vol}%% \ue050" - [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] && micinfo="^c#161616^^b#fd4285^\ue02b mute^d^" || micinfo="${mic}%% \ue029" + [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && volinfo="^c#161616^^b#fd4285^mute \ue04f^d^" || volinfo="${vol}%% \ue050" + [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micinfo="^c#161616^^b#fd4285^\ue02b mute^d^" || micinfo="${mic}%% \ue029" printf "${micinfo} ${volinfo}" fi fi diff --git a/_suckless/dwm/config.h b/_suckless/dwm/config.h index 0ad8194..19cff17 100644 --- a/_suckless/dwm/config.h +++ b/_suckless/dwm/config.h @@ -143,8 +143,8 @@ static Key keys[] = { { 0, XF86XK_AudioMicMute, spawn, SHCMD("sb-volume micmute") }, { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pactl set-sink-volume @DEFAULT_SINK@ +5%; kill -46 $(pidof dwmblocks)") }, { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pactl set-sink-volume @DEFAULT_SINK@ -5%; kill -46 $(pidof dwmblocks)") }, - { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("doas xbacklight -inc 10") }, - { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("doas xbacklight -dec 10") }, + { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("pactl set-source-volume @DEFAULT_SOURCE@ +5%; kill -46 $(pidof dwmblocks)") }, + { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("pactl set-source-volume @DEFAULT_SOURCE@ -5%; kill -46 $(pidof dwmblocks)") }, }; /* button definitions */