From 1af7fd24f47fc5793430f5385c7bab975cd1c49c Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 15 Mar 2023 00:48:54 +0100 Subject: [PATCH] sb-volume now serves for micmute key too --- _desktop/_scripts/key-micmute | 11 ----------- _desktop/_scripts/sb-volume | 31 +++++++++++++++++++++++++++---- _desktop/qtile/config.py | 2 +- 3 files changed, 28 insertions(+), 16 deletions(-) delete mode 100755 _desktop/_scripts/key-micmute diff --git a/_desktop/_scripts/key-micmute b/_desktop/_scripts/key-micmute deleted file mode 100755 index fa68a78..0000000 --- a/_desktop/_scripts/key-micmute +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -state=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') -case ${state} in - yes) - echo 0 | doas tee /sys/devices/platform/thinkpad_acpi/leds/platform::micmute/brightness - pactl set-source-mute @DEFAULT_SOURCE@ 0 ;; - no) - echo 1 | doas tee /sys/devices/platform/thinkpad_acpi/leds/platform::micmute/brightness - pactl set-source-mute @DEFAULT_SOURCE@ 1 ;; -esac diff --git a/_desktop/_scripts/sb-volume b/_desktop/_scripts/sb-volume index bc53a87..99982b9 100755 --- a/_desktop/_scripts/sb-volume +++ b/_desktop/_scripts/sb-volume @@ -1,12 +1,35 @@ #!/bin/bash +key_micmute() { + state=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') + case ${state} in + yes) + echo 0 | doas tee /sys/devices/platform/thinkpad_acpi/leds/platform::micmute/brightness + pactl set-source-mute @DEFAULT_SOURCE@ 0 ;; + no) + echo 1 | doas tee /sys/devices/platform/thinkpad_acpi/leds/platform::micmute/brightness + pactl set-source-mute @DEFAULT_SOURCE@ 1 ;; + esac +} + +vol_decrease() { + pactl set-sink-volume @DEFAULT_SINK@ -5% + volume=$(pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk -F' / *' '{print $2}') + notify-send -t 2000 -u low "volume: $volume" +} + +vol_increase() { + pactl set-sink-volume @DEFAULT_SINK@ +5% + volume=$(pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk -F' / *' '{print $2}') + notify-send -t 2000 -u low "volume: $volume" +} + if [ $1 ]; then case $1 in - inc) pactl set-sink-volume @DEFAULT_SINK@ +5%;; - dec) pactl set-sink-volume @DEFAULT_SINK@ -5%;; + dec) vol_decrease ;; + inc) vol_increase ;; + key) key_micmute ;; esac - volume=$(pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk -F' / *' '{print $2}') - notify-send -t 2000 -u low "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="mic muted" || micmute="" diff --git a/_desktop/qtile/config.py b/_desktop/qtile/config.py index d67d1ce..2a352f2 100644 --- a/_desktop/qtile/config.py +++ b/_desktop/qtile/config.py @@ -92,7 +92,7 @@ keys = [ Key([mod], "r", lazy.reload_config()), # media keys Key([], "XF86AudioMute", lazy.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle")), - Key([], "XF86AudioMicMute", lazy.spawn("key-micmute")), + Key([], "XF86AudioMicMute", lazy.spawn("sb-volume key")), Key([], "XF86AudioRaiseVolume", lazy.spawn("sb-volume inc")), Key([], "XF86AudioLowerVolume", lazy.spawn("sb-volume dec")), Key([], "XF86MonBrightnessUp", lazy.spawn("xbacklight -inc 10")),