From 46fb5c57707c2cfa5540a4dda101a8304e5131c9 Mon Sep 17 00:00:00 2001
From: Adam <2327942-adamsdesk@users.noreply.gitlab.com>
Date: Mon, 1 Aug 2022 14:26:16 -0600
Subject: [PATCH] feat: update general settings

---
 git/.gitconfig | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 4c50fca..73094ca 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,9 +1,19 @@
-[user]
-	email = foobar@adamsdesk.com
-	name = Adam
-
+[includeIf "gitdir:~/dev/Arcticons/"]
+    path = .gitconfig-github
+[includeIf "gitdir:~/dev/adamsdesk.com/"]
+    path = .gitconfig-gitlab
+[includeIf "gitdir:~/dev/dotfiles/"]
+    path = .gitconfig-gitlab
+[includeIf "gitdir:~/dev/kb/"]
+    path = .gitconfig-gitlab
+[includeIf "gitdir:~/dev/kb/_public/"]
+    path = .gitconfig-cirrus
+[includeIf "gitdir:~/dev/atled-lightsctl-web/"]
+    path = .gitconfig-gitlab
+[includeIf "gitdir:~/dev/steephillfood/"]
+    path = .gitconfig-gitlab
 [core]
-	autocrlf = false
+    autocrlf = false
     whitespace = -indent-with-non-tab,trailing-space,cr-at-eol
 
 [color]
@@ -44,4 +54,6 @@
 [merge]
     tool = diff
 [init]
-	defaultBranch = main
+    defaultBranch = main
+[gpg]
+	program = /usr/bin/gpg