diff --git a/dots/xorg/.xinitrc b/dots/xorg/.xinitrc
new file mode 100644
index 0000000..20f11f6
--- /dev/null
+++ b/dots/xorg/.xinitrc
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+#twm &
+#xclock -geometry 50x50-1+1 &
+#xterm -geometry 80x50+494+51 &
+#xterm -geometry 80x20+494-0 &
+#exec xterm -geometry 80x66+0+0 -name login
+exec i3
diff --git a/dots/xorg/.xserverrc b/dots/xorg/.xserverrc
new file mode 100644
index 0000000..b4de252
--- /dev/null
+++ b/dots/xorg/.xserverrc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/scripts/99_deploy.sh b/scripts/99_deploy.sh
index 85f0f6f..3f402af 100644
--- a/scripts/99_deploy.sh
+++ b/scripts/99_deploy.sh
@@ -176,6 +176,10 @@ if [ ${operation} == "dots" ] ; then
     mkdir -p ${file_path}
     deploy_file "${dots_trg}/waybar/*" "${file_path}/"
 
+    # xorg
+    file_path=/home/${user}/
+    deploy_file "${dots_trg}/xorg/*" "${file_path}/"
+
 fi
 
 # dots+ (wallpapers, fonts ++)