X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/01e206524dfa62b8812599366806a11f2cae15fd..3f0543eabf72014ed44dfbf06e1580a3853bcee8:/gitconfig

diff --git a/gitconfig b/gitconfig
index d426b5c..da096be 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,14 +1,34 @@
 [user]
-	name = Ben Beltran
-	email = ben@nsovocal.com
-	signingkey = 8ABB89672AFB58F5
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[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
-[gpg]
-	program = gpg2
+  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'