From 949ffd42c9fbda6fed2b2e8f4427787ee19b12be Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 8 Oct 2013 16:12:23 +0200
Subject: [PATCH] xinitrc: Move settings from xmodmaprc to xinitrc.

This way Caps lock is only remapped to Ctrl if not already done.
---
 xinitrc   | 14 ++++++++++++--
 xmodmaprc |  6 +++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/xinitrc b/xinitrc
index f262cae..73ac111 100755
--- a/xinitrc
+++ b/xinitrc
@@ -92,8 +92,18 @@ if installed setxkbmap; then
     setxkbmap us
 fi
 
-# Use my X11 key bindings.
-xmodmap "$HOME/.xmodmaprc"
+# Use the Caps lock as Ctrl because it easier to reach and very useful for all
+# programs. Caps lock is removed completely. Thanks to
+# http://snarfed.org/space/switch%20control%20and%20caps%20lock
+if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
+    xmodmap -e 'remove Lock = Caps_Lock'
+    xmodmap -e 'remove Control = Control_L'
+    xmodmap -e 'keysym Caps_Lock = Control_L'
+    xmodmap -e 'add Control = Control_L'
+fi
+# Move grave and tilde next to left shift key. This setting may only be
+# necessary because of my German keyboard which I use with English settings.
+xmodmap -e 'keycode 94 = grave asciitilde'
 
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
diff --git a/xmodmaprc b/xmodmaprc
index 7fdda43..cd30622 100644
--- a/xmodmaprc
+++ b/xmodmaprc
@@ -1,6 +1,10 @@
 ! Keymap configuration file for xmodmap.
+!
+! Not actively used at the moment, ~/.xinitrc performs the same settings. Only
+! necessary in case the settings reset itself and a manual run is necessary.
+! Keep in sync with settings in xinitrc.
 
-! Copyright (C) 2011-2012  Simon Ruderich
+! Copyright (C) 2011-2013  Simon Ruderich
 !
 ! This file is free software: you can redistribute it and/or modify
 ! it under the terms of the GNU General Public License as published by
-- 
2.44.1