diff --git a/arch-user/bin/i3blocks/volume.sh b/arch-user/bin/i3blocks/volume.sh index 5807eca..28c721f 100755 --- a/arch-user/bin/i3blocks/volume.sh +++ b/arch-user/bin/i3blocks/volume.sh @@ -3,14 +3,21 @@ sink_mute=$(pactl get-sink-mute @DEFAULT_SINK@) case "$sink_mute" in *yes*) sink_res=M;; - *) sink_res=$(pactl get-sink-volume @DEFAULT_SINK@ | sed -e 's/.*\s\([0-9]*%\).*/\1/;t;d');; + *) sink_res=$(pactl get-sink-volume @DEFAULT_SINK@ | sed -e 's/.*\s\([0-9]*\)%.*/\1/;t;d');; esac source_mute=$(pactl get-source-mute @DEFAULT_SOURCE@) case "$source_mute" in *yes*) source_res=M;; - *) source_res=$(pactl get-source-volume @DEFAULT_SOURCE@ | sed -e 's/.*\s\([0-9]*%\).*/\1/;t;d');; + *) source_res=$(pactl get-source-volume @DEFAULT_SOURCE@ | sed -e 's/.*\s\([0-9]*\)%.*/\1/;t;d');; esac -echo "🔈 $sink_res 🎙 $source_res" +bt_status="$(bluetoothctl devices Connected)" +if [ -n "$bt_status" ]; then + sink_icon=🎧 +else + sink_icon=🔈 +fi + +echo "$sink_icon $sink_res% 🎙 $source_res%" diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl index 41f9b8f..824d743 100644 --- a/arch-user/config/sway/config.tmpl +++ b/arch-user/config/sway/config.tmpl @@ -71,24 +71,24 @@ bindsym --to-code $mod+q layout stacking bindsym --to-code $mod+w layout tabbed bindsym --to-code $mod+f fullscreen bindsym --to-code $mod+p layout toggle split -bindsym --to-code $mod+j split none bindsym --to-code $mod+l split v bindsym --to-code $mod+u split h -bindsym --to-code $mod+y resize shrink height 4ppt or 40px -bindsym --to-code $mod+Semicolon resize grow height 4ppt or 40px -bindsym --to-code $mod+Bracketleft resize shrink width 2ppt or 40px -bindsym --to-code $mod+Bracketright resize grow width 2ppt or 40px +bindsym --to-code $mod+y split none # mid row - focus, movement bindsym --to-code $mod+$fwd focus child bindsym --to-code $mod+$left focus left -bindsym --to-code $mod+$down focus down bindsym --to-code $mod+$up focus up +bindsym --to-code $mod+$down focus down bindsym --to-code $mod+$right focus right bindsym --to-code $mod+$bwd focus parent bindsym --to-code $altmod+$left move left 40px bindsym --to-code $altmod+$up move up 40px bindsym --to-code $altmod+$down move down 40px bindsym --to-code $altmod+$right move right 40px +bindsym --to-code $mod+Shift+$left resize shrink width 2ppt or 40px +bindsym --to-code $mod+Shift+$up resize shrink height 4ppt or 40px +bindsym --to-code $mod+Shift+$down resize grow height 4ppt or 40px +bindsym --to-code $mod+Shift+$right resize grow width 2ppt or 40px # bottom row - modeless, extra focus floating_modifier $mod normal bindsym --to-code $altmod+x move scratchpad