Update plugins, add oleoboard

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 485954e152f1e06333b6b1dbb379e5b5f9757740..08ed718ca6686e415876e067eb3f08f4f4e54cee 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,14 +1,34 @@
 [user]
 [user]

-       name = Ruben Beltran del Rio
-       email = ruben@unlimited.pizza
-       signingkey = B7C3495D98F27947
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
+  signingkey = 85D81B97D96211C7
+[sendemail]
+  smtpserver = smtp.fastmail.com
+  smtpuser = r@bdr.sh
+  smtpencryption = ssl
+  smtpserverport = 465

 [core]
 [core]

-       editor = nvim
+  pager = delta
+  editor = nvim

 [color]
 [color]

-       diff = auto
+  diff = auto

 [push]
 [push]

-       default = simple
+  default = simple
+  autoSetupRemote = true

 [pull]
   rebase = false
 [commit]
 [pull]
   rebase = false
 [commit]

-       gpgsign = true
+  gpgsign = true
+[init]
+  defaultBranch = main
+[diff]
+  external = difft
+  tool = vimdiff
+  algorithm = histogram
+[merge]
+  tool = nvim
+  conflictstyle = zdiff3
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'