Consolidate dotfiles improvements (Fish, tmux, CI, deps)

[hdp617]

Summary

Consolidates the planned dotfiles improvements from the earlier draft PRs into a single branch. Fish is brought closer to zsh parity, tmux matches the Catppuccin stack, chezmoi init prompts for a machine name, and CI/dependency monitoring is added.

Changes

Fish shell

• Prepend ~/.bin in 00-path.fish.tmpl (chezmoi dot_bin/ scripts)
• Custom fish_prompt / fish_right_prompt aligned with zsh/tmux (USER at <~/.name> + fish_git_prompt)
• Port helpers from ~/.shell/aliases.sh: cdgr, fpr, serve, jump, xin, nonascii, syspip / syspip3

Chezmoi / machine identity

• Prompt for machine_name at init (default: hostname); template dot_name.tmpl from that value
• Add missing nord-dircolors external for zsh dircolors
• Pin all git-repo externals via clone.args = ["--branch", …] for Renovate tracking

Note: archive-type externals conflict with the existing ~/.vim / ~/.zsh / ~/.shell symlink layout (chezmoi reports inconsistent state and blocks apply). Externals therefore remain git-repo with explicit branch pins instead of archive URLs.

Tmux

• Switch from Solarized 256 to Catppuccin Macchiato
• Resolve ~/.name once into @machine_name when config is sourced

CI & dependency monitoring

• .github/workflows/chezmoi.yml — render all *.tmpl and chezmoi apply --dry-run
• .github/renovate.json — bump pinned externals, Homebrew bundle, and GitHub Actions
• .github/workflows/dependency-audit.yml — weekly OSV scan of pinned externals + macOS Homebrew outdated report

Docs

• README reconciled with actual layout, new Fish functions/prompts, pinned externals, and monitoring setup

Test plan

• All *.tmpl render with test [data] including machine_name
• chezmoi apply --exclude externals deploys dotfiles correctly
• Fish syntax check passes for all dot_config/fish/**/*.fish
• nord-dircolors clones at v0.2.0 and provides src/dir_colors
• CI workflows pass (chezmoi validate + dependency-audit)
• chezmoi init on a fresh machine prompts for machine name
• Fish session shows custom prompts and which tmx resolves to ~/.bin/tmx

Supersedes

This PR consolidates draft PRs #1–#9. After merge, those draft branches can be closed.

  

[gemini-code-assist]

Code Review

This pull request introduces a custom machine name configuration prompted during initialization, pins external plugins in .chezmoiexternal.toml with Renovate dependency monitoring, updates the tmux configuration to use the Catppuccin Macchiato theme, and adds several modular Fish shell helper functions and prompts. Feedback focuses on optimizing Fish prompt performance by avoiding external command spawning (such as id -u, whoami, and cat), caching the machine name, correcting path precedence in fish_add_path, replacing non-standard git commands, and adding robust argument validation and force-fetch support to the new shell functions.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

[gemini-code-assist]

In Fish shell, calling fish_add_path -p sequentially prepends each path to the front of the list one by one. This means that the last path prepended ($HOME/bin) will end up at the very front of your PATH, while the first one prepended ($HOME/.bin) will end up behind the others.

To ensure that $HOME/.bin has the highest precedence (as intended for the chezmoi dot_bin scripts), you should pass all paths to a single fish_add_path invocation in the desired order.

fish_add_path -g -p $HOME/.bin $HOME/.local/bin $HOME/bin

[gemini-code-assist]

Calling the external command (id -u) on every prompt render spawns a subshell and an external process, which can introduce noticeable prompt lag (especially on macOS or WSL).

Fish provides a built-in fish_is_root_user function that is much faster and more idiomatic.

    if fish_is_root_user
        echo -n (set_color red)'>'(set_color normal)' '
    else
        echo -n (set_color magenta)'>'(set_color normal)' '
    end

[gemini-code-assist]

Avoid calling external commands like (id -u) and (whoami) on every prompt render, as spawning external processes on the hot path of prompt rendering causes lag.

Instead, use the built-in fish_is_root_user function and the standard $USER environment variable.

    if fish_is_root_user
        echo -n (set_color red)$USER(set_color normal)
    else
        echo -n (set_color magenta)$USER(set_color normal)
    end

[gemini-code-assist]

Since _machine_name is called by fish_right_prompt on every single prompt render, executing cat or hostname -s every time spawns unnecessary external processes and slows down the shell.

We can cache the resolved machine name in a global variable so that it is only computed once per shell session.

function _machine_name
    if not set -q _cached_machine_name
        if test -f $HOME/.name
            set -g _cached_machine_name (cat $HOME/.name)
        else
            set -g _cached_machine_name (hostname -s)
        end
    end
    echo $_cached_machine_name
end

[gemini-code-assist]

git root is not a standard git command and relies on a custom global git alias being configured. If this alias is missing on a fresh machine, cdgr will fail.

It is more robust and self-contained to use the standard git rev-parse --show-toplevel command directly.

function cdgr
    cd (git rev-parse --show-toplevel)
end

[gemini-code-assist]

If fpr is run multiple times for the same peer branch (e.g., to fetch updates after they force-pushed or rebased), the fetch will fail with a non-fast-forward error.

Prefixing the refspec with + allows force-updating the local reference to match the remote branch.

    git fetch git@github.com:$user/$repo +$branch:$user/$branch

[gemini-code-assist]

In tmux, #(...) in status settings is evaluated periodically (every status-interval seconds), not once when the configuration is sourced. This means tmux will repeatedly spawn shell processes to check for ~/.name and run hostname.

To actually resolve this once when the configuration is sourced (as the comment intends), use run-shell to set the option dynamically.

# Machine name for status bar (resolved once when config is sourced)
run-shell 'tmux set -g @machine_name "$(if [ -f $HOME/.name ]; then cat $HOME/.name; else hostname -s; fi)"'

[gemini-code-assist]

Using $argv[1] limits this function to scanning only the first argument and ignores any subsequent files passed.

Using $argv instead allows scanning multiple files at once, or reading from standard input if no arguments are provided.

function nonascii
    env LC_ALL=C grep -n '[^[:print:][:space:]]' $argv
end

[gemini-code-assist]

If jump is run without any arguments, dirname will receive no arguments and fail with an error.

Adding a quick guard check makes the function safer and more user-friendly.

function jump
    if set -q argv[1]
        cd (dirname $argv[1])
    else
        echo "Usage: jump <file_path>" >&2
        return 1
    end
end

[gemini-code-assist]

If xin is called with fewer than two arguments (e.g., no directory or no command), it will either change directory to $HOME or fail with empty command execution.

Adding a guard check ensures that both a target directory and a command are provided.

function xin
    if test (count $argv) -lt 2
        echo "Usage: xin <directory> <command> [args...]" >&2
        return 1
    end
    cd $argv[1]; or return
    set -e argv[1]
    command $argv
end