From 961359beecff3be2406de8b28cd38a211be28eca Mon Sep 17 00:00:00 2001
From: "M. Yas. Davoodeh" <30480116+MYDavoodeh@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:00:23 +0430
Subject: [PATCH] Make kbselect show variants

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

diff --git a/.local/bin/statusbar/kbselect b/.local/bin/statusbar/kbselect
index f0c923f5..b3f778d2 100755
--- a/.local/bin/statusbar/kbselect
+++ b/.local/bin/statusbar/kbselect
@@ -1,7 +1,8 @@
 #!/bin/sh
 # works on any init system
 # requirements: dmenu, xorg-setxkbmap
-kb="$(setxkbmap -query | grep -oP 'layout:\s*\K\w+')" || exit 1
+q="$(setxkbmap -query)"
+kb="$(echo "$q" | 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)"
@@ -13,4 +14,4 @@ case $BLOCK_BUTTON in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-echo "$kb"
+variant="$(echo "$q" | grep -oP 'variant:\s*\K\w+')" && echo "$kb-$variant" || echo "$kb"