From babd7393d5804ffdaae1976426c9afb5ee89930e Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Wed, 27 Feb 2019 17:11:13 +0000
Subject: [PATCH] Support Xmodmap, xinit -> x_server

Prefer x_server to xinit as it's more general.
---
 configs/linux/x_server/.Xmodmap | 7 +++++++
 configs/linux/x_server/.xinitrc | 2 ++
 configs/linux/xinit/.xinitrc    | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 configs/linux/x_server/.Xmodmap
 create mode 100644 configs/linux/x_server/.xinitrc
 delete mode 100644 configs/linux/xinit/.xinitrc

diff --git a/configs/linux/x_server/.Xmodmap b/configs/linux/x_server/.Xmodmap
new file mode 100644
index 000000000..518793b86
--- /dev/null
+++ b/configs/linux/x_server/.Xmodmap
@@ -0,0 +1,7 @@
+! remap caps-lock to escape
+remove Lock = Caps_Lock
+keysym Caps_Lock = Escape
+
+! swap ctrl and super (similar to OSX) -- currently not working
+! remove mod4 = Super_L
+! add control = Super_L
diff --git a/configs/linux/x_server/.xinitrc b/configs/linux/x_server/.xinitrc
new file mode 100644
index 000000000..6622e8c5f
--- /dev/null
+++ b/configs/linux/x_server/.xinitrc
@@ -0,0 +1,2 @@
+! Load keybindings
+xmodmap ~/.Xmodmap
diff --git a/configs/linux/xinit/.xinitrc b/configs/linux/xinit/.xinitrc
deleted file mode 100644
index ef0cff44c..000000000
--- a/configs/linux/xinit/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-xrdb ~/.Xresources