X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/aca6370146f453f45ccebd020eb8315b54fd0e5b..729a5b29a9d392b2e9dcf6f7a4e221c7eaed68a1:/gitconfig

diff --git a/gitconfig b/gitconfig
index 3be84db..4c9ba68 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,36 @@
 [user]
-	name = Ben Beltran
-	email = ben@nsovocal.com
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
+  signingkey = ~/.ssh/git.pub
+[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
+  autoSetupRemote = true
+[pull]
+  rebase = false
+[commit]
+  gpgsign = true
+[gpg]
+  format = ssh
+[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'