X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/d20131863adc4f800134858219e3bb768fbd2446..6cb3a2cb65ff29d51068a2561936109dc7d654e5:/gitconfig

diff --git a/gitconfig b/gitconfig
index cc14fe3..da096be 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,23 +1,34 @@
 [user]
-	name = Ruben Beltran del Rio
-	email = ruben@unlimited.pizza
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
-	smtpserver = smtp.fastmail.com
-	smtpuser = ruben@unlimited.pizza
-	smtpencryption = ssl
-	smtpserverport = 465
+  smtpserver = smtp.fastmail.com
+  smtpuser = r@bdr.sh
+  smtpencryption = ssl
+  smtpserverport = 465
 [core]
-	editor = nvim
+  pager = delta
+  editor = nvim
 [color]
-	diff = auto
+  diff = auto
 [push]
-	default = simple
+  default = simple
+  autoSetupRemote = true
 [pull]
   rebase = false
 [commit]
-	gpgsign = true
+  gpgsign = true
 [init]
-	defaultBranch = main
+  defaultBranch = main
 [diff]
   external = difft
+  tool = vimdiff
+  algorithm = histogram
+[merge]
+  tool = nvim
+  conflictstyle = zdiff3
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'