Make xmodmap keyboard-agnostic

2 files changed, 36 insertions, 41 deletions

diff --git a/bin/keyboard.sh b/bin/keyboard.sh
new file mode 100755
index 0000000..e0759ab
--- /dev/null
+++ b/bin/keyboard.sh
@@ -0,0 +1,36 @@
+# Dvorak programer setxkbmap us -variant dvp
+
+# Make caps lock a Control
+xmodmap -e "clear Lock"
+xmodmap -e "keysym Caps_Lock = Control_L Caps_Lock"
+xmodmap -e "add Control = Control_L"
+
+# Remap modifiers (Keyboard dependent)
+xmodmap -e "keycode 94 = Mode_switch"
+xmodmap -e 'keycode 108 = Alt_L'
+
+# Remap modifiers (Keyboard independent)
+xmodmap -e 'keysym space = Alt_L'
+xmodmap -e 'keycode any = space'
+
+# Numbers
+xmodmap -e "keysym d = d D 0"
+xmodmap -e "keysym o = o O 1"
+xmodmap -e "keysym m = m M 1"
+xmodmap -e "keysym e = e E 2"
+xmodmap -e "keysym w = w W 2"
+xmodmap -e "keysym u = u U 3"
+xmodmap -e "keysym v = v V 3"
+xmodmap -e "keysym h = h H 4"
+xmodmap -e "keysym t = t T 5"
+xmodmap -e "keysym n = n N 6"
+xmodmap -e "keysym g = g G 7"
+xmodmap -e "keysym c = c C 8"
+xmodmap -e "keysym r = r R 9"
+
+# Xcape settings
+killall -9 xcape
+
+xcape -e 'Control_L=Escape'
+xcape -e 'Shift_L=Escape'
+xcape -e 'Alt_L=space'
diff --git a/xmodmap b/xmodmap
deleted file mode 100755
index e2a5d65..0000000
--- a/xmodmap
+++ /dev/null
@@ -1,41 +0,0 @@
-# Remap dead key
-xmodmap -e "keycode 94 = backslash asciicircum"
-
-# Make caps lock a modifier
-xmodmap -e "clear Lock"
-xmodmap -e "keycode 66 = Control_L"
-xmodmap -e "add Control = Control_L"
-
-# New mode switch
-xmodmap -e "keycode 94 = Mode_switch"
-xmodmap -e "keycode 64 = Alt_L"
-
-# Numbers
-xmodmap -e "keycode 65 = space space 0"
-xmodmap -e "keycode 43 = d D 0"
-xmodmap -e "keycode 39 = o O 1"
-xmodmap -e "keycode 58 = m M 1"
-xmodmap -e "keycode 40 = e E 2"
-xmodmap -e "keycode 59 = w W 2"
-xmodmap -e "keycode 41 = u U 3"
-xmodmap -e "keycode 60 = v V 3"
-xmodmap -e "keycode 44 = h H 4"
-xmodmap -e "keycode 45 = t T 5"
-xmodmap -e "keycode 46 = n N 6"
-xmodmap -e "keycode 30 = g G 7"
-xmodmap -e "keycode 31 = c C 8"
-xmodmap -e "keycode 32 = r R 9"
-
-# Dollars, symbols hard to reach
-xmodmap -e "keycode 47 = s S dollar"
-
-# Make Control_L and Shift_L work as "Escape"
-xcape -e 'Control_L=Escape'
-xcape -e 'Shift_L=Escape'
-
-# Map alt-gr and space to alt
-xmodmap -e 'clear mod5'
-xmodmap -e 'keycode 108 = Alt_L'
-xmodmap -e 'keycode 65 = Alt_L'
-xmodmap -e 'keycode any = space'
-xcape -e 'Alt_L=space'