add git-delta and tune tmux

1 files changed, 29 insertions, 0 deletions

diff --git a/git/dot-gitconfig b/git/dot-gitconfig
new file mode 100644
index 0000000..e5c0949
--- /dev/null
+++ b/git/dot-gitconfig
@@ -0,0 +1,29 @@
+[user]
+	name = Miguel
+	email = m.i@gmx.at
+
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+
+[mergetool]
+  prompt = true
+
+[mergetool "vimdiff"]
+  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J'
+    
+[diff]
+    tool = nvimdiff
+
+[difftool "nvimdiff"]
+    cmd = "/root/nvim.appimage -d $LOCAL $REMOTE"
+    prompt = true
+
+[pager]
+    diff = delta
+    show = delta
+    log = delta
+    reflog = delta
+
+[interactive]
+    diffFilter = delta --color-only