Skip to content

refactor(git): include the agent config instead of replacing the global one #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potsrevennil merged 1 commit into from
Oct 20, 2026
Merged

refactor(git): include the agent config instead of replacing the global one #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions users/home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@

xdg.configFile = {
"git".source = config.lib.file.mkOutOfStoreSymlink "${dotfiles}/git";
# A store copy, not out-of-store: see the header of the file.
"git-agent/config".source = ./home/git/agent.gitconfig;
"nvim".source = config.lib.file.mkOutOfStoreSymlink "${dotfiles}/kapi-vim";
} // pkgs.lib.optionalAttrs (! lite) {
"wezterm".source = config.lib.file.mkOutOfStoreSymlink "${dotfiles}/wezterm";
Expand Down
17 changes: 7 additions & 10 deletions users/home/git/agent.gitconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Git config for AI agent sessions: everything from the normal config, with output trimmed
# for token cost. Claude Code selects it via GIT_CONFIG_GLOBAL in ~/.claude/settings.json;
# interactive shells never read it.
# Git config for AI agent sessions: output trimmed for token cost, layered over the normal
# config. Claude Code includes it from ~/.claude/settings.json:
#
# home-manager links a Nix store copy to ~/.config/git-agent/config (users/home.nix), so it
# exists whatever branch the main checkout is on, and `git config --global` from an agent
# fails instead of editing this tracked file. Edits take effect after `make home`.
# "env": {"GIT_CONFIG_COUNT": "1", "GIT_CONFIG_KEY_0": "include.path",
# "GIT_CONFIG_VALUE_0": "~/.config/git/agent.gitconfig"}
#
# GIT_CONFIG_GLOBAL replaces both global files, so include both (a missing one is skipped).
[include]
path = ~/.config/git/config
path = ~/.gitconfig
# An include, not GIT_CONFIG_GLOBAL: the normal global config still loads, a missing file
# (an older branch checked out) is skipped instead of dropping identity, and
# `git config --global` writes the normal config as usual. Interactive shells never read it.

# Short status with the branch line, instead of the long form with hint paragraphs.
[status]
Expand Down
Loading