X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/a025ed13f09802b493b027b8eef9587796cca697..1125dae35548bc9143925818648623e1c02cf8bb:/gitconfig?ds=inline

diff --git a/gitconfig b/gitconfig
index 6c30a47..08ed718 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,34 @@
 [user]
-	name = Ben Beltran
-	email = ben@nsovocal.com
-	signingkey = 8ABB89672AFB58F5
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
+  signingkey = 85D81B97D96211C7
+[sendemail]
+  smtpserver = smtp.fastmail.com
+  smtpuser = r@bdr.sh
+  smtpencryption = ssl
+  smtpserverport = 465
 [core]
-	editor = vim
+  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
+[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'