summaryrefslogtreecommitdiff
path: root/.config/git/config
diff options
context:
space:
mode:
authorSam Nystrom <sam@samnystrom.dev>2023-05-31 21:16:23 -0400
committerSam Nystrom <sam@samnystrom.dev>2023-05-31 21:16:23 -0400
commit24b15da2f28525858e834b66aea238271e4e1a1e (patch)
treec95859eb71eb98bd3c4001a4913d65d1ca27e7a1 /.config/git/config
parent82cfa5977c65283c7ac27e1532db044ceffe28a2 (diff)
move .gitconfig to .config/git
Diffstat (limited to '.config/git/config')
-rw-r--r--.config/git/config46
1 files changed, 46 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..df73400
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,46 @@
+[core]
+ pager = delta
+
+[user]
+ email = sam@samnystrom.dev
+ name = Sam Nystrom
+
+[init]
+ defaultBranch = main
+
+[interactive]
+ diffFilter = delta --color-only
+
+[merge]
+ conflictstyle = diff3
+
+[diff]
+ colorMoved = default
+
+[sendemail]
+ smtpserver = smtp.migadu.com
+ smtpuser = sam@samnystrom.dev
+ smtpencryption = ssl
+ smtpserverport = 465
+ annotate = yes
+ verify = off
+
+[credential]
+ helper = himitsu
+
+[delta]
+ navigate = true
+ side-by-side = true
+ line-numbers = true
+ features = catppuccin-macchiato
+
+[delta "catppuccin-macchiato"]
+ dark = true
+ minus-emph-style = normal "#a55e69" # 70% of red
+ minus-style = normal "#5e353b" # 40% of red
+ plus-emph-style = normal "#6a8c5f"
+ plus-style = normal "#41563a"
+ line-numbers-zero-style = "#939ab7"
+ line-numbers-minus-style = "#ed8796"
+ line-numbers-plus-style = "#a6da95"
+ syntax-theme = catppuccin-macchiato