From ee32c131c9840a19b62f842ca64c4818c49ff87f Mon Sep 17 00:00:00 2001 From: dandrews Date: Mon, 14 Sep 2026 18:55:03 -0500 Subject: [PATCH] Add optional ~/.bashrc.local overlay, sourced last Machine-specific settings (editor, pager, man-page colours, extra aliases, tool init) otherwise have to live in the tracked .bashrc, which guarantees a conflict on every pull or merge for anyone who customizes their config. An untracked ~/.bashrc.local lets the tracked file be taken from upstream wholesale, carrying only this hook forward. The hook is the final line on purpose: the PATH export, the LESS_TERMCAP_* block and the starship/zoxide init above it would clobber overlay values if it were sourced earlier. Keeping it at end-of-file also makes the change a clean append, so it will not conflict as the file evolves. No-op unless the file exists, so nothing changes for anyone who does not create it. Co-Authored-By: Warp --- .bashrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bashrc b/.bashrc index c2a2883..48d4e55 100644 --- a/.bashrc +++ b/.bashrc @@ -869,3 +869,6 @@ fi if [[ $- == *i* ]] && command -v zoxide >/dev/null 2>&1; then eval "$(zoxide init bash)" fi + +# Source local customizations if they exist +[ -f ~/.bashrc.local ] && . ~/.bashrc.local