diff --git a/.gitignore b/.gitignore
index b35253a9..0f50f596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 !.vim
 !.vim/**
 .vim/.netrwhist
+!.xinitrc
 !.zsh
 !.zsh/**
 !.zshrc
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 00000000..9b900240
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+loadkeys de
+setxkbmap de
+
+exec $1
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# exec qtile
+# exec awesome
+# ...or the Window Manager of your choice