X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/3422e7aace62f888ee801bf9ec80561f6fe7f20c..ae76334da6a08dba3d8082b53ea945d3fbda67f8:/gitconfig?ds=sidebyside

diff --git a/gitconfig b/gitconfig
index e60d8a9..f3cb18d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,9 +1,14 @@
 [user]
 	name = Ruben Beltran del Rio
 	email = ruben@unlimited.pizza
-	signingkey = B7C3495D98F27947
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[sendemail]
+	smtpserver = smtp.fastmail.com
+	smtpuser = ruben@unlimited.pizza
+	smtpencryption = ssl
+	smtpserverport = 465
 [core]
-	editor = vim
+	editor = nvim
 [color]
 	diff = auto
 [push]
@@ -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'