Merge branch 'master' of ustrat:git/staging/profile

[profile] / dot / xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 8fce589..9875cad 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -99,7 +99,10 @@ initialize () {
   run init xset m 2 1
 
   ## Key mappings.
-  xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
+  xmodmap $HOME/.xmodmap
+  if [ -r $HOME/.xmodmap-local ]; then
+    xmodmap $HOME/.xmodmap-local
+  fi
 }
 
 ###--------------------------------------------------------------------------