Merge branch 'main' of git.sr.ht:~rbdr/dotfiles

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 3be84dbf5b477d424e455643ade5b3ec6f056185..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,30 @@
 [user]
-       name = Ben Beltran
-       email = ben@nsovocal.com
+       name = Ruben Beltran del Rio
+       email = ruben@unlimited.pizza
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[sendemail]
+       smtpserver = smtp.fastmail.com
+       smtpuser = ruben@unlimited.pizza
+       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'