diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..a27314c
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,9 @@
+[user]
+    email = danieln@selfnet.de
+    name = Daniel Naegele
+[push]
+    default = simple
+[alias]
+    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
+    ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
+    grep = grep -Ii
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..8d2afe9
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,6 @@
+export TERM="screen-256color"
+
+# autostart tmux
+if which tmux 2>&1 >/dev/null; then
+    test -z "$TMUX" && (tmux attach || tmux new-session)
+fi