Update aerc accounts

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 2f7f713fc3b9203f72c266d9540d62cb1b7e260e..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,30 @@
 [user]
        name = Ruben Beltran del Rio
        email = ruben@unlimited.pizza
 [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]
 [core]

-       editor = vim
+       editor = nvim

 [color]
        diff = auto
 [push]
        default = simple
 [color]
        diff = auto
 [push]
        default = simple

+[pull]
+  rebase = false

 [commit]
        gpgsign = true
 [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'