From 057c5753a79b70be63415c978c369431e6e88f13 Mon Sep 17 00:00:00 2001
From: Ava Gaiety W <ava@wroten.me>
Date: Sat, 17 Feb 2024 12:13:54 -0600
Subject: [PATCH] Added gitconfig file, adjusted readme, added configs

---
 git/.gitconfig | 33 +++++++++++++++++++++++++++++++++
 git/README.md  |  9 +++++----
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 git/.gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..7d20bd5
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,33 @@
+[user]
+	name = Ava Gaiety W.
+	email = ava@wroten.me
+[core]
+  editor = nvim
+  pager = delta
+[config]
+	name = Ava Gaiety Wroten
+	email = ava@wroten.me
+[push]
+	default = current
+	followtags = true
+[merge]
+	conflictstyle = zdiff3
+[init]
+	defaultBranch = main
+[help]
+	autocorrect = prompt
+[interactive]
+  diffFilter = delta --color-only
+[delta]
+  side-by-side = true
+  hyperlinks = true
+  light = false
+  navigate = true # use n and N to move between diff sections
+  theme = Nord
+  features = decorations
+[diff]
+	algorithm = histogram
+[branch]
+	sort = -committerdate
+[tag]
+	sort = taggerdate
diff --git a/git/README.md b/git/README.md
index 2f7aad0..9e57cb0 100644
--- a/git/README.md
+++ b/git/README.md
@@ -8,9 +8,10 @@ Some basic git configuration steps
 
 Follow SSH steps for Github and Gitlab for adding a [ssh key](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh)
 
+Install `delta` https://dandavison.github.io/delta/installation.html
+
+Copy the local `.gitconfig` file into your home directory:
+
 ```bash
-git config --global config.name "Ava Gaiety Wroten"
-git config --global config.email "ava@wroten.me"
-git config --global core.editor "nvim"
-git config --global push.default current
+cp ./git/.gitconfig ~/.gitconfig
 ```