Also includes config.local for XDG-local overrides alongside
the existing ~/.gitconfig.local for backcompat.

Assisted-by: Claude Opus 4.6 via pi

diff --git a/.gitconfig b/.config/git/config
similarity index 99%
rename from .gitconfig
rename to .config/git/config
index 90c912f6..0e1d4165 100644
--- a/.gitconfig
+++ b/.config/git/config
@@ -137,5 +137,6 @@
 
 [include]
 	path = ~/.gitconfig.local
+	path = config.local
 [credential]
 	helper = osxkeychain
diff --git a/frork/_dotfiles.fnl b/frork/_dotfiles.fnl
index 2a0ca0a5..d527d959 100644
--- a/frork/_dotfiles.fnl
+++ b/frork/_dotfiles.fnl
@@ -1,11 +1,10 @@
-(local {: ok :utils {: dirname}} (require :flork))
+(local {: ok : no :utils {: dirname}} (require :flork))
 
 (ok :git "~/.dotfiles" "https://git.kejadlen.dev/alpha/dotfiles.git")
 
 (let [dotfiles [:.config
                 :.digrc
                 :.gemrc
-                :.gitconfig
                 :.git_templates
                 :.hammerspoon
                 :.inputrc
@@ -29,5 +28,8 @@
 (ok :symlink "~/.dotfiles/ai/claude" "~/.claude")
 (ok :symlink "~/.dotfiles/ai/AI.md" "~/.claude/CLAUDE.md")
 
+;; moved to .config/git/config
+(no :symlink :$HOME/.gitconfig :$HOME/.dotfiles/.gitconfig)
+
 ;; for per-system configuration
 (ok :directory :$HOME/.config/jj/conf.d)