dotfiles

commit f0c1b6f5bb7231414295fa2fa0d6f5827e1bb421
parent 5c65d9b16642a64a5af25ff7da98dadbe9019d93
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Fri, 18 Jan 2019 11:23:13 +0100

Use setxkbmap for key swapping, not slow xmodmap

Diffstat:
M
links/.Xmodmap
 | 
8
++++----
M
links/.xinitrc
 | 
4
++--
M
links/bin/keyboard-layout-switch.sh
 | 
6
+++---

3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/links/.Xmodmap b/links/.Xmodmap
@@ -11,10 +11,10 @@
 !pointer = 1 2 3 5 4 7 6 8 9 10 11 12
 
 ! Exchange Alt and Win
-remove mod1 = Alt_L
-remove mod4 = Super_L
-add mod1 = Super_L
-add mod4 = Alt_L
+! remove mod1 = Alt_L
+! remove mod4 = Super_L
+! add mod1 = Super_L
+! add mod4 = Alt_L
 
 ! Exchange tilde and lesser/greater
 !keycode  94 = grave asciitilde dead_grave dead_tilde grave asciitilde
diff --git a/links/.xinitrc b/links/.xinitrc
@@ -23,8 +23,8 @@ eval $(gpg-agent)
 xautolock -time 10 -locker $HOME/bin/xlock -detectsleep &
 
 # Read .Xmodmap for modified keys
-setxkbmap -option ctrl:nocaps
-xmodmap ~/.Xmodmap
+setxkbmap -option ctrl:nocaps -option altwin:swap_lalt_lwin
+#xmodmap ~/.Xmodmap
 
 # Read .xbindkeysrc for special key-bindings
 xbindkeys
diff --git a/links/bin/keyboard-layout-switch.sh b/links/bin/keyboard-layout-switch.sh
@@ -9,11 +9,11 @@ lang1="us"
 lang2="dk"
 
 function set_language {
-    setxkbmap "$1" -option ctrl:nocaps
-    notify-send "$1"
-    xmodmap ~/.Xmodmap
     echo "$1" > "$layoutfile"
     pkill -RTMIN+3 i3blocks
+    setxkbmap "$1" -option ctrl:nocaps -option altwin:swap_lalt_lwin
+    #xmodmap $HOME/.Xmodmap
+    notify-send "$1"
 }
 
 [[ $# -gt 0 ]] && set_language "$1"