Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion nix/home/git-hooks.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ let
exit 0
fi

# secrets/ belongs here too: sops-nix renders those files at activation, so a secrets-only
# merge changes nothing on disk until a rebuild runs. That failure is completely silent —
# the repo says one thing and ~/.ssh/config says another.
if ${git} diff ${range} --name-only 2>/dev/null \
| grep -qE '^(flake\.nix|flake\.lock|nix/|configs/|Justfile)'; then
| grep -qE '^(flake\.nix|flake\.lock|nix/|configs/|secrets/|Justfile)'; then
echo "▶ dotfiles: nix/config changed (${label}) → running just rebuild"
# rebuild targets the main tree's current state (= merged main).
# just / nh / nix resolve by inheriting the PATH of the interactive shell that ran the pull.
Expand Down
Loading