diff --git a/_desktop/_scripts/sb-volume b/_desktop/_scripts/sb-volume index b51a790..4180496 100755 --- a/_desktop/_scripts/sb-volume +++ b/_desktop/_scripts/sb-volume @@ -1,6 +1,15 @@ #!/bin/bash -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 ] && micmute=" \uf131 " || micmute="" -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 "${micmute} \ufc5d " || printf "$micmute" +if [ $1 ]; then + case $1 in + inc) pactl set-sink-volume @DEFAULT_SINK@ +5%;; + dec) pactl set-sink-volume @DEFAULT_SINK@ -5%;; + esac + volume=$(pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk -F' / *' '{print $2}') + dunstify -h int:value:$volume -r 20 -t 800 "volume: $volume" +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 ] && micmute=" \uf131 " || micmute="" + 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 "${micmute} \ufc5d " || printf "$micmute" +fi diff --git a/_desktop/qtile/config.py b/_desktop/qtile/config.py index ae1e6ad..1be6fd0 100644 --- a/_desktop/qtile/config.py +++ b/_desktop/qtile/config.py @@ -75,8 +75,8 @@ keys = [ # media keys Key([], "XF86AudioMute", lazy.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle")), Key([], "XF86AudioMicMute", lazy.spawn("key-micmute")), - Key([], "XF86AudioRaiseVolume", lazy.spawn("pactl set-sink-volume @DEFAULT_SINK@ +5%")), - Key([], "XF86AudioLowerVolume", lazy.spawn("pactl set-sink-volume @DEFAULT_SINK@ -5%")), + Key([], "XF86AudioRaiseVolume", lazy.spawn("sb-volume inc")), + Key([], "XF86AudioLowerVolume", lazy.spawn("sb-volume dec")), Key([], "XF86MonBrightnessUp", lazy.spawn("xbacklight -inc 10")), Key([], "XF86MonBrightnessDown", lazy.spawn("xbacklight -dec 10")), ]