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

diff --git a/gitconfig b/gitconfig
index 485954e..8fca402 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,12 @@
 [user]
 	name = Ruben Beltran del Rio
-	email = ruben@unlimited.pizza
-	signingkey = B7C3495D98F27947
+	email = git@r.bdr.sh
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[sendemail]
+	smtpserver = smtp.fastmail.com
+	smtpuser = r@bdr.sh
+	smtpencryption = ssl
+	smtpserverport = 465
 [core]
 	editor = nvim
 [color]
@@ -12,3 +17,14 @@
   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'