From 2a1b7fc3d1f758c7625fb5ab66e5f770b3f3b864 Mon Sep 17 00:00:00 2001
From: "M. Yas. Davoodeh" <30480116+MYDavoodeh@users.noreply.github.com>
Date: Tue, 28 Jul 2020 20:22:33 +0430
Subject: [PATCH] Make kbselect independent from xkblayout-state (#775)

---
 .local/bin/statusbar/kbselect | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.local/bin/statusbar/kbselect b/.local/bin/statusbar/kbselect
index d7313c6..f0c923f 100755
--- a/.local/bin/statusbar/kbselect
+++ b/.local/bin/statusbar/kbselect
@@ -1,14 +1,14 @@
 #!/bin/sh
 # works on any init system
-# requirements: dmenu, xorg-setxkbmap, xkblayout-state (https://github.com/nonpop/xkblayout-state)
-kb="$(xkblayout-state print "%s")" || exit 1
+# requirements: dmenu, xorg-setxkbmap
+kb="$(setxkbmap -query | grep -oP 'layout:\s*\K\w+')" || exit 1
 
 case $BLOCK_BUTTON in
 	1) kb_choice="$(awk '/! layout/{flag=1; next} /! variant/{flag=0} flag {print $2, "- " $1}' /usr/share/X11/xkb/rules/base.lst | dmenu -l 15)"
 	kb="$(echo "$kb_choice" | awk '{print $3}')"
 	setxkbmap "$kb"
 	pkill -RTMIN+30 "${STATUSBAR:-dwmblocks}";;
-	3) notify-send "⌨  Keyboard/language module" "$(xkblayout-state print "\- Current layout: %s (%n)")
+	3) notify-send "⌨  Keyboard/language module" "$(printf "%s" "\- Current layout: $(setxkbmap -query | grep -oP 'layout:\s*\K\w+')")
 - Left click to change keyboard.";;
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac