From 547aed390bce0ae13509bbfc7e662a92fa7d00c3 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 9 Nov 2021 09:11:40 -0600
Subject: [PATCH] Finally get multiple gitconfigs layering

---
 common/envs             |  1 +
 common/git/config       | 36 +++++++++++++++---------------------
 host/personal/gitconfig |  5 +++++
 3 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 host/personal/gitconfig

diff --git a/common/envs b/common/envs
index 84da938..72e9c37 100644
--- a/common/envs
+++ b/common/envs
@@ -21,3 +21,4 @@ host/laptop/divvy-macbook
 host/laptop/postmates-macbook
 host/laptop/uber-macbook
 host/laptop/val-macbook
+host/personal
diff --git a/common/git/config b/common/git/config
index 571c598..cb6cb2a 100644
--- a/common/git/config
+++ b/common/git/config
@@ -1,6 +1,5 @@
 [user]
 	name = Daniel Flanagan
-	email = daniel@lyte.dev
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f
@@ -9,14 +8,14 @@
 	required = true
 
 [core]
-	editor = nvim
+	editor = $EDITOR
 	excludesfile = /home/daniel/.home/.gitignore
 
 [http "https://gopkg.in"]
 	followRedirects = true
 
 [diff]
-	tool = nvimdiff
+	tool = $EDITOR -d
 
 [difftool]
 	prompt = false
@@ -34,8 +33,8 @@
 	ds = diff --staged
 	dt = difftool
 	f = fetch
-	l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
-	graph = log --graph --abbrev-commit --decorate --oneline --all
+	l = log --graph --abbrev-commit --decorate --oneline --all
+	plainlog = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
 	ls = ls-files
 	mm = merge master
 	p = push
@@ -46,38 +45,33 @@
 	sur = submodule update --remote
 
 [merge]
-	tool = nvimdiff
+	tool = $EDITOR -d
 	conflictstyle = diff3
 
 [mergetool]
 	prompt = false
 
 [mergetool "nvimdiff"]
-	cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'
+	cmd = $EDITOR -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'
 
 [pager]
 	branch = false
 	# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
-	# diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
-	# 	-c 'silent %s/^diff/\\r\\rdiff/' \
-	# 	-c 'silent set ft=diff' \
-	# 	-c 'silent execute \"normal gg2dd\"' \
-	# 	-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
-
-[commit]
-	gpgsign = true
+	diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
+		-c 'silent %s/^diff/\\r\\rdiff/' \
+		-c 'silent set ft=diff' \
+		-c 'silent execute \"normal gg2dd\"' \
+		-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
 
 [gpg]
 	program = gpg2
 
-[include]
-	path = $ENV_PATH/gitconfig
-
-[include]
-	path = $HOME/.config/lytedev-env/divvy/gitconfig
-
 [color]
 	ui = auto
 
 [push]
 	default = current
+
+[include]
+	path = ~/.config/lytedev-env/host-personal/gitconfig
+	path = ~/.config/lytedev-env/divvy/gitconfig
diff --git a/host/personal/gitconfig b/host/personal/gitconfig
new file mode 100644
index 0000000..0ae5d91
--- /dev/null
+++ b/host/personal/gitconfig
@@ -0,0 +1,5 @@
+[user]
+	email = daniel@lyte.dev
+
+[commit]
+	gpgsign = true