From 6206502fd2d052af9eb0621203889b371f2eb751 Mon Sep 17 00:00:00 2001
From: thek4n <thek4n@yandex.ru>
Date: Wed, 12 Nov 2025 16:03:47 +0300
Subject: [PATCH] fix i3block volume

---
 TARGETS.sh                           |  2 +-
 home/user/.config/i3blocks/config    |  2 +-
 home/user/.config/sway/bindings.conf | 20 +++++++++-----------
 home/user/.config/sway/config        |  3 ++-
 home/user/.local/bin/i3blocks_helper |  3 ++-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/TARGETS.sh b/TARGETS.sh
index f8d8ff7..2cc6552 100644
--- a/TARGETS.sh
+++ b/TARGETS.sh
@@ -13,7 +13,7 @@ git:.config/git .local/bin/ga
 ranger:.config/ranger
 gpg:
 i3:.xinitrc .xprofile .Xresources .config/i3 .config/i3blocks .config/rofi .config/picom .local/bin/slm .local/bin/slm_rofi.sh .local/bin/power_rofi.sh .local/bin/i3_switch_workspace.sh .config/mimeapps.list .local/bin/screenshot .local/bin/i3_swap_workspaces .local/bin/i3blocks_helper .local/bin/switch-layout %pomodoro
-sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .local/bin/screenshot .local/bin/i3blocks_helper .local/bin/layout_change_handler .config/swaylock .Xresources %pomodoro
+sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .config/rofi .local/bin/screenshot .local/bin/i3blocks_helper .local/bin/layout_change_handler .config/swaylock .Xresources %pomodoro
 pomodoro:
 bat:.config/bat
 font:
diff --git a/home/user/.config/i3blocks/config b/home/user/.config/i3blocks/config
index dd29e25..6324b01 100644
--- a/home/user/.config/i3blocks/config
+++ b/home/user/.config/i3blocks/config
@@ -44,7 +44,7 @@ interval=30
 [volume]
 command=i3blocks_helper volume
 interval=1
-signal=3
+signal=1
 
 [pomodoro]
 command=i3blocks_helper pomodoro
diff --git a/home/user/.config/sway/bindings.conf b/home/user/.config/sway/bindings.conf
index 21e1605..460257a 100644
--- a/home/user/.config/sway/bindings.conf
+++ b/home/user/.config/sway/bindings.conf
@@ -1,19 +1,17 @@
 # vim: ft=swayconfig
 # Sway bindings
 
-set $mod Mod4
+bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +10% && pkill -RTMIN+1 i3blocks
+bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -10% && pkill -RTMIN+1 i3blocks
+bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -RTMIN+1 i3blocks
 
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +10%
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -10%
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
+bindsym --locked XF86AudioPlay exec playerctl play-pause
+bindsym --locked XF86AudioPause exec playerctl play-pause
+bindsym --locked XF86AudioNext exec playerctl next
+bindsym --locked XF86AudioPrev exec playerctl previous
 
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioPause exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20
+bindsym --locked XF86MonBrightnessUp exec xbacklight -inc 20
+bindsym --locked XF86MonBrightnessDown exec xbacklight -dec 20
 
 
 bindsym $mod+p exec pomodoro toggle && pkill -RTMIN+2 i3blocks
diff --git a/home/user/.config/sway/config b/home/user/.config/sway/config
index fc8b288..43f4a0b 100644
--- a/home/user/.config/sway/config
+++ b/home/user/.config/sway/config
@@ -12,10 +12,11 @@
 # exec --no-startup-id hsetroot
 # exec --no-startup-id feh --randomize --no-fehbg --bg-scale $HOME/.wallpaper/*
 
+set $mod Mod4
 
+include ~/.config/sway/other.conf
 include ~/.config/sway/bindings.conf
 include ~/.config/sway/autostart.conf
 include ~/.config/sway/bar.conf
-include ~/.config/sway/other.conf
 
 include ~/.config/sway/config.d/*.conf
diff --git a/home/user/.local/bin/i3blocks_helper b/home/user/.local/bin/i3blocks_helper
index 92b0353..f9f072d 100755
--- a/home/user/.local/bin/i3blocks_helper
+++ b/home/user/.local/bin/i3blocks_helper
@@ -57,7 +57,8 @@ cmd_time() {
 }
 
 cmd_volume() {
-    amixer get Master | awk -F'[][]' '/%/ {print "   "$2}' | head -n 1
+    value="$(pactl --format=json get-sink-volume @DEFAULT_SINK@ | jq --raw-output '.volume."front-left".value_percent')"
+    echo "  ${value}"
 }
 
 cmd_pomodoro() {