aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoviuro <moviuro+git@gmail.com>2017-03-12 11:51:26 +0100
committerMoviuro <moviuro+git@gmail.com>2017-03-12 11:51:26 +0100
commite8656222b73d213a9d98f5c8dfd7ea38d1b1d500 (patch)
tree3cc20486e209392b3cc26c0492c3ce3eca853cd6
parent748eb8ec392c21424ccd9fbefef2b3ee0fce2ab3 (diff)
downloadrofi-pass-e8656222b73d213a9d98f5c8dfd7ea38d1b1d500.tar.gz
README.md, rofi-pass: don't run setxkbmap(1)
The user has to take care of it, as they're probably smarter than the script. We didn't handle the cases where there were variants (such as `fr bepo`). Having the user fix this during session startup also fixes various other issues in different software (such as sxhkd(1)).
-rw-r--r--README.md2
-rwxr-xr-xrofi-pass7
2 files changed, 1 insertions, 8 deletions
diff --git a/README.md b/README.md
index 5fe857f..732d2d9 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Also included is an import script for keepass2 databases. It's the same script t
## FAQ
* rofi pass prints garbage instead of my actual passes
-** Set your keyboard layout in config
+** Make sure to run `setxkbmap <language> <variant>` at the start of your Xorg session.
## Alternative
diff --git a/rofi-pass b/rofi-pass
index 53e5de5..e5a66c4 100755
--- a/rofi-pass
+++ b/rofi-pass
@@ -561,13 +561,6 @@ if [[ ! -d "$HOME/.cache/rofi-pass" ]]; then
mkdir "$HOME/.cache/rofi-pass"
fi
-if [[ -n $keyboard ]]; then
- setxkbmap ${keyboard}
-else
- keyboard=$(setxkbmap -query | grep layout | grep -oE '[^: ]+$')
- setxkbmap ${keyboard}
-fi
-
# set help color
if [[ $help_color == "" ]]; then
help_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | gawk -F ',' '/,/{gsub(/ /, "", $2); print $2}')