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