From 24b15da2f28525858e834b66aea238271e4e1a1e Mon Sep 17 00:00:00 2001 From: Sam Nystrom Date: Wed, 31 May 2023 21:16:23 -0400 Subject: move .gitconfig to .config/git --- .config/git/config | 46 ++++++++++++++++++++++++++++++++++++++++++++++ .gitconfig | 36 ------------------------------------ 2 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 .config/git/config delete mode 100644 .gitconfig 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 diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 73db1e2..0000000 --- a/.gitconfig +++ /dev/null @@ -1,36 +0,0 @@ -[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 - light = false - side-by-side = true - line-numbers = true - syntax-theme = catppuccin-macchiato -- cgit v1.2.3