From 6f7e5107450d99f982dc1163e5c209d66280d9b4 Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Sun, 5 Jan 2025 20:34:15 +0000
Subject: [PATCH] wip

---
 arch-user/config/i3blocks/battery    | 2 +-
 arch-user/config/i3blocks/config     | 5 +++++
 arch-user/config/i3blocks/xkb_layout | 2 ++
 arch-user/config/sway/config.tmpl    | 6 +++++-
 arch-user/config/xkb/symbols/ru      | 1 +
 arch-user/config/xkb/symbols/us      | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 arch-user/config/i3blocks/xkb_layout

diff --git a/arch-user/config/i3blocks/battery b/arch-user/config/i3blocks/battery
index 06fd309..dd389c5 100755
--- a/arch-user/config/i3blocks/battery
+++ b/arch-user/config/i3blocks/battery
@@ -5,7 +5,7 @@ read -r cap </sys/class/power_supply/BAT1/capacity
 read -r volt </sys/class/power_supply/BAT1/voltage_now
 read -r curr </sys/class/power_supply/BAT1/current_now
 
-w=$(($volt*$curr/1000000000000))
+w=$((volt*curr/1000000000000))
 if [ "$stat" = "1" ]; then
 	echo "⚡$cap%▴${w}W"
 else
diff --git a/arch-user/config/i3blocks/config b/arch-user/config/i3blocks/config
index baff7e1..56dd05d 100644
--- a/arch-user/config/i3blocks/config
+++ b/arch-user/config/i3blocks/config
@@ -8,6 +8,11 @@ interval=3600
 command=~/.config/i3blocks/battery
 interval=10
 
+[xkb_layout]
+command=~/.config/i3blocks/xkb_layout
+interval=once
+signal=1
+
 [time]
 command=date +"%Y-%m-%dT%H:%M:%SZ"
 interval=1
diff --git a/arch-user/config/i3blocks/xkb_layout b/arch-user/config/i3blocks/xkb_layout
new file mode 100644
index 0000000..64191ff
--- /dev/null
+++ b/arch-user/config/i3blocks/xkb_layout
@@ -0,0 +1,2 @@
+#!/bin/sh
+swaymsg -t get_inputs | jq '"⌨ "+map(select(has("xkb_active_layout_name")))[0].xkb_active_layout_name'
diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl
index a74b246..930b543 100644
--- a/arch-user/config/sway/config.tmpl
+++ b/arch-user/config/sway/config.tmpl
@@ -43,7 +43,7 @@ input "type:keyboard" {
 	xkb_layout us(yz),us(basic),ru(yz)
 	repeat_rate 50
 }
-bindsym --to-code Shift+ISO_Level3_Shift input "type:keyboard" xkb_switch_layout next
+bindsym --to-code Shift+ISO_Level3_Shift input "type:keyboard" xkb_switch_layout next; exec pkill -SIGRTMIN+1 i3blocks
 input "type:touchpad" {
 	tap enabled
 	natural_scroll enabled
@@ -114,6 +114,10 @@ bindsym --to-code $mod+v exec wtype -P XF86Paste
 # media
 bindsym --to-code XF86MonBrightnessDown exec ~/.config/sway/brightness-set-and-notify.sh 5%-
 bindsym --to-code XF86MonBrightnessUp exec ~/.config/sway/brightness-set-and-notify.sh 5%+
+bindsym --to-code XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+bindsym --to-code XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+bindsym --to-code XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+bindsym --to-code XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
 # basic scripts
 bindsym --to-code $mod+Escape kill
 bindsym --to-code $mod+Return exec footclient
diff --git a/arch-user/config/xkb/symbols/ru b/arch-user/config/xkb/symbols/ru
index abaf238..11be703 100644
--- a/arch-user/config/xkb/symbols/ru
+++ b/arch-user/config/xkb/symbols/ru
@@ -1,6 +1,7 @@
 xkb_symbols "yz" {
 	
 	include "ru(common)"
+	name[Group1]= "ru-yz";
 	
 	# functional
 	key.type = "ONE_LEVEL";
diff --git a/arch-user/config/xkb/symbols/us b/arch-user/config/xkb/symbols/us
index 79b4499..0f5ebac 100644
--- a/arch-user/config/xkb/symbols/us
+++ b/arch-user/config/xkb/symbols/us
@@ -1,6 +1,7 @@
 xkb_symbols "yz" {
 	
 	include "us(colemak_dh)"
+	name[Group1]= "en-yz";
 	
 	# functional
 	key.type = "ONE_LEVEL";