X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/8b8f8e3bc33326354d1a253dd95cb19448fc10d2..967de9a270bccf66da73eda4e17d78d41c4e14d6:/gitconfig

diff --git a/gitconfig b/gitconfig
index 6c30a47..8fca402 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,30 @@
 [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
+	editor = nvim
 [color]
 	diff = auto
 [push]
 	default = simple
+[pull]
+  rebase = false
 [commit]
 	gpgsign = true
+[init]
+	defaultBranch = main
+[diff]
+  external = difft
+	tool = vimdiff
+[merge]
+  tool = nvim
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'