diff options
Diffstat (limited to 'dot_config')
| -rw-r--r-- | dot_config/git/config | 4 | ||||
| -rw-r--r-- | dot_config/zsh/dot_zshrc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index db562a6..9eae2c0 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -148,3 +148,7 @@ assume8bitEncoding = UTF-8 [credential "smtp://127.0.0.1:1025"] helper = "!f() { test \"$1\" = get && printf 'password=%s\\n' \"$(pass show proton/bridge-smtp)\"; }; f" +[include] + ; Machine-local overrides (e.g. SSH-format signing on the remote-dev VM). + ; Git silently skips this if the file is absent. + path = ~/.config/git/config.local diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 7a9538d..94781ac 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -359,15 +359,15 @@ export GPG_TTY=$TTY gpg-connect-agent updatestartuptty /bye &>/dev/null # ── direnv (per-project env via .envrc; nix-direnv loaded from direnvrc) ───── -eval "$(direnv hook zsh)" +command -v direnv >/dev/null && eval "$(direnv hook zsh)" # ── Zoxide (smart directory jumping) ────────────────────────────────────────── # z foo → jump to frecency-ranked dir matching "foo" # zi → interactive picker with fzf -eval "$(zoxide init zsh)" +command -v zoxide >/dev/null && eval "$(zoxide init zsh)" # ── FZF ─────────────────────────────────────────────────────────────────────── -source <(fzf --zsh) +command -v fzf >/dev/null && source <(fzf --zsh) # Ctrl-X Ctrl-R: search history with fzf and immediately execute fzf-history-widget-accept() { |