rootiest/fish-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): don't create global shadow for scrollback source vars

Browse Source 
A global __fish_scrollback_history_dir/_max_files would shadow the universal
that config-settings writes, defeating live mirror updates and stale-displaying
the value until restart. Export the default, override from the universal only
if set.
This commit is contained in:
Rootiest
2026-06-24 00:01:57 -04:00
parent 2772b26704
commit a422400d72
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.fish
+9 -6
View File
@@ -116,15 +116,18 @@ set -gx SUDO_EDITOR $EDITOR
set -gx GPG_TTY (tty) set -gx GPG_TTY (tty)
# ────────────────────────── Scrollback History ────────────────────────── # ────────────────────────── Scrollback History ──────────────────────────
# fish-style source of truth (editable via config-settings); exported for the # Optional fish-style source of truth (set -U via config-settings); exported
# POSIX wrappers (paru/yay/tmux/zellij/_prune_terminal_logs) that read them. # for the POSIX wrappers (paru/yay/tmux/zellij/_prune_terminal_logs) that read
# them. We export the default unconditionally, then override from the universal
# var only if set — deliberately NOT creating a global, which would shadow the
# universal and stop live edits (config-settings → Paths) from taking effect.
set -gx SCROLLBACK_HISTORY_DIR "$HOME/.terminal_history"
set -q __fish_scrollback_history_dir set -q __fish_scrollback_history_dir
or set -g __fish_scrollback_history_dir "$HOME/.terminal_history" and set -gx SCROLLBACK_HISTORY_DIR $__fish_scrollback_history_dir
set -gx SCROLLBACK_HISTORY_DIR $__fish_scrollback_history_dir
set -gx SCROLLBACK_HISTORY_MAX_FILES 100
set -q __fish_scrollback_history_max_files set -q __fish_scrollback_history_max_files
or set -g __fish_scrollback_history_max_files 100 and set -gx SCROLLBACK_HISTORY_MAX_FILES $__fish_scrollback_history_max_files
set -gx SCROLLBACK_HISTORY_MAX_FILES $__fish_scrollback_history_max_files
# Wire up a clean exit function that won't fire on background subshells # Wire up a clean exit function that won't fire on background subshells
# Replacing the exit builtin is opinionated (C3 overrides); smart_exit also # Replacing the exit builtin is opinionated (C3 overrides); smart_exit also
# guards itself so a live toggle takes effect without restarting the shell. # guards itself so a live toggle takes effect without restarting the shell.