diff --git a/.bashrc b/.bashrc
new file mode 100755
index 0000000..84315cf
--- /dev/null
+++ b/.bashrc
@@ -0,0 +1,15 @@
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '
+export EDITOR="vim"
+export CUPS_GSSSERVICENAME=HTTP
+export PATH=$PATH:/home/kuba/bin
+export PATH="$HOME/git/esp-open-sdk/xtensa-lx106-elf/bin/:$PATH"
+
+alias dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles.git --work-tree=$HOME"
+xhost +local:kuba > /dev/null
diff --git a/.xinitrc b/.xinitrc
new file mode 100755
index 0000000..3dd26c1
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+WM=i3
+if (( $# == 1 ))
+then
+  WM=$1
+fi
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+export EDITOR="vim"
+export CUPS_GSSSERVICENAME=HTTP
+#srandrd conkyshit/displays
+
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+
+volnoti &
+#xxkb &
+owncloud &
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+#exec kdm
+# ...or the Window Manager of your choice
+rm ~/.i3.log.old
+mv ~/.i3.log ~/.i3.log.old
+rm ~/.i3.log
+#exec $WM -d all -V >> ~/.i3.log
+exec $WM >> ~/.i3.log