aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2026-05-26 15:06:55 -0700
committerGravatar Tom Willemse2026-05-27 15:34:55 -0700
commit2d12081560458db0e0797d9018047b14add8eec3 (patch)
tree4c2b3a11258a418f2f79e8d12ec1e7ca4b483457
parent8b44ca414ff0f3647a5e959eafa46607a39e9f55 (diff)
downloadnew-dotfiles-2d12081560458db0e0797d9018047b14add8eec3.tar.gz
new-dotfiles-2d12081560458db0e0797d9018047b14add8eec3.zip
GNUmakefile: Add work git configuration
-rw-r--r--GNUmakefile2
-rw-r--r--git/.config/git/config2
-rw-r--r--git/.config/git/diamond-interactive-social-api-ignore5
-rw-r--r--git/.config/git/diamond-interactive-social-api.cfg2
-rw-r--r--git/.config/git/diamond-interactive.cfg9
-rw-r--r--git/.config/git/personal.cfg0
6 files changed, 19 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index c6de1e6..de2d1d5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -156,7 +156,7 @@ surfingkeys/dist/punt.js: surfingkeys/punt.ts surfingkeys/home.ts
## Diamond Interactive MacOS
-diamond-interactive: brew-install wezterm-install glide-install
+diamond-interactive: brew-install wezterm-install glide-install git-install
brew-install: _mbsetupuser/Brewfile
brew bundle --file $^ --cleanup
diff --git a/git/.config/git/config b/git/.config/git/config
index bf4f18e..bca0a24 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -10,3 +10,5 @@
[init]
defaultBranchname = main
defaultBranch = main
+[includeIf "gitdir:~/code/diamond-interactive/"]
+ path = diamond-interactive.cfg
diff --git a/git/.config/git/diamond-interactive-social-api-ignore b/git/.config/git/diamond-interactive-social-api-ignore
new file mode 100644
index 0000000..f12bfaa
--- /dev/null
+++ b/git/.config/git/diamond-interactive-social-api-ignore
@@ -0,0 +1,5 @@
+.dir-locals.el
+.wakatime-project
+GPATH
+GTAGS
+GRTAGS \ No newline at end of file
diff --git a/git/.config/git/diamond-interactive-social-api.cfg b/git/.config/git/diamond-interactive-social-api.cfg
new file mode 100644
index 0000000..50ddb41
--- /dev/null
+++ b/git/.config/git/diamond-interactive-social-api.cfg
@@ -0,0 +1,2 @@
+[core]
+ excludesFile = ~/.config/git/diamond-interactive-social-api-ignore \ No newline at end of file
diff --git a/git/.config/git/diamond-interactive.cfg b/git/.config/git/diamond-interactive.cfg
new file mode 100644
index 0000000..9ac0376
--- /dev/null
+++ b/git/.config/git/diamond-interactive.cfg
@@ -0,0 +1,9 @@
+[user]
+ name = Tom Willemsen
+ email = tom@punt.com
+
+[github]
+ user = tomw-punt
+
+[includeIf "gitdir:social-api/"]
+ path = diamond-interactive-social-api.cfg \ No newline at end of file
diff --git a/git/.config/git/personal.cfg b/git/.config/git/personal.cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/git/.config/git/personal.cfg