2 files changed, 26 insertions, 2 deletions

diff --git a/git/gitconfig b/git/gitconfig
new file mode 100644
index 0000000..58c34f1
--- /dev/null
+++ b/git/gitconfig
@@ -0,0 +1,22 @@
+[user]
+        email = ts@its1.de
+        name = Thomas Schmucker
+
+[core]
+        pager = delta
+
+[interactive]
+        diffFilter = delta --color-only
+
+[delta]
+        light = false
+        navigate = true
+        side-by-side = true
+        line-numbers = true
+
+[merge]
+        conflictstyle = diff3
+
+[diff]
+        colorMoved = default
+
diff --git a/install.sh b/install.sh
index cfd8da7..0959a01 100755
--- a/install.sh
+++ b/install.sh
@@ -10,11 +10,13 @@ cp -R tmux "$CONFIG"
 cp -R nvim "$CONFIG"
 
 # zsh
-mkdir -p "$CONFIG/zsh"
-
 cp zsh/zshenv  ~/.zshenv
 
+mkdir -p "$CONFIG/zsh"
 cp zsh/zshrc   "$CONFIG/zsh/.zshrc"
 cp zsh/aliases "$CONFIG/zsh/aliases"
 cp zsh/prompt  "$CONFIG/zsh/prompt"
 
+# git
+cp git/gitconfig ~/.gitconfig
+