From 523dfc212c3e5b32c3ae116eae5ccf73e03df329 Mon Sep 17 00:00:00 2001
From: Jack Platten <jack@platten.me>
Date: Wed, 20 May 2026 14:57:34 -0700
Subject: [PATCH] stuff

---
 private_dot_config/git/config.tmpl         | 26 +++++++++-------------
 private_dot_config/git/github.conf.tmpl    |  4 ++++
 private_dot_config/git/gitlab.conf.tmpl    |  4 ++++
 private_dot_config/halloy/config.toml.tmpl |  6 ++---
 private_dot_config/jj/config.toml.tmpl     |  3 ++-
 5 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 private_dot_config/git/github.conf.tmpl
 create mode 100644 private_dot_config/git/gitlab.conf.tmpl

diff --git a/private_dot_config/git/config.tmpl b/private_dot_config/git/config.tmpl
index 3d9dd39..9da99f6 100644
--- a/private_dot_config/git/config.tmpl
+++ b/private_dot_config/git/config.tmpl
@@ -1,13 +1,10 @@
 {{ $dir := dir .chezmoi.targetFile -}}
-{{ $github := joinPath $dir "github.conf" -}}
-{{ $gitlab := joinPath $dir "gitlab.conf" -}}
+{{ $github_file := joinPath $dir "github.conf" -}}
+{{ $gitlab_file := joinPath $dir "gitlab.conf" -}}
 
 [init]
 	defaultBranch = main
 
-[include]
-	path = "{{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator }}.gitconfig.d{{ .chezmoi.pathSeparator }}themes.gitconfig"
-
 [user]
 	email = "{{ .email }}"
 	name = "{{ .name }}"
@@ -59,8 +56,7 @@
 	required = true
 [core]
 	editor = nano
-	excludesfile = "{{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator }}.config{{ .chezmoi.pathSeparator }}git{{ .chezmoi.pathSeparator }}ignore"
-
+	excludesfile = {{joinPath .chezmoi.homeDir ".config" "git" "ignore" | quote}}
 [interactive]
 	diffFilter = delta --color-only
 
@@ -75,7 +71,7 @@
 	external = difft
 	colorMoved = default
 [gpg "ssh"]
-	allowedSignersFile = /Users/jack/.ssh/allowed_signers
+	allowedSignersFile = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}}
 
 [fetch]
 	prune = true
@@ -88,17 +84,17 @@
 	followTags = true
 
 [includeIf "hasconfig:remote.*.url:https://github.com/**"]
-	path = "{{ $github }}"
+	path = "{{ $github_file }}"
 [includeIf "hasconfig:remote.*.url:git@github.com:*/**"]
-	path = "{{ $github }}"
+	path = "{{ $github_file }}"
 [includeIf "hasconfig:remote.*.url:ssh://git@github.com:*/**"]
-	path = "{{ $github }}"
+	path = "{{ $github_file }}"
 [includeIf "hasconfig:remote.*.url:ssh://git@gitlab.com:*/**"]
-	path = "{{ $gitlab }}"
+	path = "{{ $gitlab_file }}"
 [includeIf "hasconfig:remote.*.url:https://gitlab.com/**"]
-	path = "{{ $gitlab }}"
+	path = "{{ $gitlab_file }}"
 [includeIf "hasconfig:remote.*.url:git@gitlab.com:*/**"]
-	path = "{{ $gitlab }}"
+	path = "{{ $gitlab_file }}"
 
 [pager]
 	difftool = true
@@ -139,7 +135,7 @@
     name = mergiraf
     driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
 [gitget]
-    root = "{{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator }}Developer"
+    root = {{joinPath .chezmoi.homeDir "Developer" | quote}}
 [credential "https://github.com"]
        helper =
        helper = !/opt/homebrew/bin/gh auth git-credential
diff --git a/private_dot_config/git/github.conf.tmpl b/private_dot_config/git/github.conf.tmpl
new file mode 100644
index 0000000..f74427d
--- /dev/null
+++ b/private_dot_config/git/github.conf.tmpl
@@ -0,0 +1,4 @@
+[user]
+	email = "{{ .email }}"
+	name = "{{ .name }}"
+	signingkey = "{{ .signingkey }}"
diff --git a/private_dot_config/git/gitlab.conf.tmpl b/private_dot_config/git/gitlab.conf.tmpl
new file mode 100644
index 0000000..f74427d
--- /dev/null
+++ b/private_dot_config/git/gitlab.conf.tmpl
@@ -0,0 +1,4 @@
+[user]
+	email = "{{ .email }}"
+	name = "{{ .name }}"
+	signingkey = "{{ .signingkey }}"
diff --git a/private_dot_config/halloy/config.toml.tmpl b/private_dot_config/halloy/config.toml.tmpl
index faf4025..3978d00 100644
--- a/private_dot_config/halloy/config.toml.tmpl
+++ b/private_dot_config/halloy/config.toml.tmpl
@@ -1,5 +1,5 @@
 {{ $dir := dir .chezmoi.targetFile -}}
-{{ $password := joinPath $dir "password" -}}
+{{ $password_file := joinPath $dir "password" -}}
 # Halloy config.
 #
 # For a complete list of available options,
@@ -16,7 +16,7 @@ nickname = "jack"
 
 [servers.omglol.sasl.plain]
 username = "jack"
-password_file = "{{ $password }}"
+password_file = "{{ $password_file }}"
 
 [actions.buffer]
 click_channel_name = "replace-pane"
@@ -58,4 +58,4 @@ sound = "dong"
 exclude = { users = ["NickServ"], channels = ["#halloy"] }
 
 [buffer.channel.topic_banner]
-enabled = true
\ No newline at end of file
+enabled = true
diff --git a/private_dot_config/jj/config.toml.tmpl b/private_dot_config/jj/config.toml.tmpl
index e20a0f2..41ba0ba 100644
--- a/private_dot_config/jj/config.toml.tmpl
+++ b/private_dot_config/jj/config.toml.tmpl
@@ -9,6 +9,7 @@ default-command = "log"
 diff-formatter = ["difft", "--color=always", "$left", "$right"]
 show-cryptographic-signatures = true
 editor = "nano"
+diff-editor = ":builtin"
 {{ if eq .chezmoi.os "darwin" -}}
 merge-editor = "ksdiff"
 [merge-tools.ksdiff]
@@ -22,7 +23,7 @@ merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$ri
 behavior = "drop"
 backend = "ssh"
 key = "{{ .signingkey }}"
-backends.ssh.allowed-signers = "{{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator }}.ssh{{ .chezmoi.pathSeparator }}allowed_signers"
+backends.ssh.allowed-signers = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}}
 
 
 [git]
-- 
2.51.2