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

feat(deps): add Optional/Terminal Emulator tiers, fix docker prompt hang and ov install path

Browse Source 
Reworks fish-deps' dependency classification from three tiers to five:
Required, Recommended, Optional, Terminal Emulators, and Integrations.

- Add an Optional tier for single-purpose wrapper conveniences that only
  matter if you already use that specific tool (btop, dust, duf,
  prettyping, go, lazygit, lazydocker, docker, yt-dlp, screen). Skipped by
  `fish-deps install`/`sync` by default.
- Split kitty/wezterm into their own Terminal Emulators tier, since only
  the one matching $TERM is ever relevant to a given user.
- Add --optional, --terminals, and --all flags to `install`/`sync` to
  opt back into the skipped tiers, with a summary of how many were
  skipped and which flag restores them.
- Fix `_fish_deps_status` marking missing Integrations as critical (red)
  the same as Required — only Required is red now; Recommended stays
  yellow, everything else renders as a neutral dim note.

Also fixes two bugs surfaced during dependency testing on a fresh
install:

- `fish_right_prompt` called `docker context show` on every prompt with
  no `type -q docker` guard, unlike every other optional integration in
  this config — on a system without docker this printed a visible
  "Unknown command: docker" block on every single prompt render. Added
  the missing guard, and hardened the `ld` wrapper with explicit
  docker/lazydocker presence checks.
- `ov`'s catalog entry offered `cargo install ov` as its preferred
  install method, but crates.io's `ov` is an unrelated crate, not the
  noborus/ov pager — cargo would silently install the wrong package.
  Removed the cargo path; `ov` now prefers `go install
  github.com/noborus/ov@latest` (ahead of the system PM) when go is
  available, since not all distros package `ov` in their base repos,
  and falls back to the system PM otherwise.
This commit is contained in:
rootiest
2026-08-14 16:42:37 -04:00
parent 20adb8f75c
commit c17f6663db
8 changed files with 242 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/_fish_deps_catalog.fish
+25 -5
View File
@@ -9,6 +9,26 @@
# _fdc_pm, _fdc_special) describing every managed shell dependency.
# Must be called before accessing any _fdc_* array.
#
# Tiers:
# req Required — the shell does not function without these.
# rec Recommended — meaningfully enhance the experience across
# multiple functions; the bulk of the
# catalog.
# opt Optional — minor, single-purpose wrapper
# conveniences (e.g. backs one wrapper
# function) that only matter if you already
# use that specific tool. Skipped by
# `fish-deps install`/`sync` unless
# `--optional` (or `--all`) is passed.
# term Terminal Emulators — GPU-accelerated terminal emulators
# (kitty, wezterm) that only matter if one
# of them is your actual terminal. Skipped
# by `fish-deps install`/`sync` unless
# `--terminals` (or `--all`) is passed.
# int Integrations — opt-in third-party services requiring
# their own account/setup (wakatime,
# tailscale).
#
# EXAMPLE
# _fish_deps_catalog
# echo $_fdc_bins
@@ -16,27 +36,27 @@ function _fish_deps_catalog
set -g _fdc_bins \
uv cargo fish starship fzf zoxide direnv paru yay \
wakatime tailscale \
eza lsd bat btop dust duf prettyping ov rg lazygit lazydocker trash kitty wezterm python3 yt-dlp screen
eza lsd bat btop dust duf prettyping go ov rg lazygit lazydocker docker trash kitty wezterm python3 yt-dlp screen
set -g _fdc_tiers \
rec rec req rec req rec rec rec rec \
int int \
rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec
rec rec rec opt opt opt opt opt rec rec opt opt opt rec term term rec opt opt
set -g _fdc_cargo \
"" "" "" starship "" zoxide "" "" "" \
"" "" \
eza lsd bat "" du-dust "" "" ov ripgrep "" "" trashy "" "" "" "" ""
eza lsd bat "" du-dust "" "" "" "" ripgrep "" "" "" trashy "" "" "" "" ""
set -g _fdc_pm \
uv cargo fish starship fzf zoxide direnv "" yay \
wakatime tailscale \
eza lsd bat btop dust duf prettyping ov ripgrep lazygit lazydocker trash kitty wezterm python yt-dlp screen
eza lsd bat btop dust duf prettyping go ov ripgrep lazygit lazydocker docker trash kitty wezterm python yt-dlp screen
set -g _fdc_special \
curl-uv rustup-installer git-cargo-fish curl-installer fzf-update "" "" paru-build yay-build \
wakatime-binary "" \
"" "" "" "" "" "" "" "" "" "" curl-lazydocker "" "" "" "" "" ""
"" "" "" "" "" "" "" "" go-ov "" "" curl-lazydocker "" "" "" "" "" "" ""
end
# SYNOPSIS
functions/_fish_deps_install.fish
+89
View File
@@ -9,16 +9,61 @@
# For each missing entry, prompts yes/no and the preferred install method
# when multiple options are available.
#
# Optional-tier and Terminal-Emulator-tier dependencies are skipped by
# default; pass --optional / --terminals to include them individually, or
# --all to include both.
#
# ARGUMENTS
# --optional Also offer to install Optional-tier dependencies
# --terminals Also offer to install Terminal-Emulator-tier dependencies
# --all Shorthand for --optional --terminals
#
# EXAMPLE
# _fish_deps_install
# _fish_deps_install --optional
# _fish_deps_install --terminals
# _fish_deps_install --all
function _fish_deps_install
_fish_deps_catalog
set -l include_optional 0
set -l include_terminals 0
if contains -- --all $argv
set include_optional 1
set include_terminals 1
end
if contains -- --optional $argv
set include_optional 1
end
if contains -- --terminals $argv
set include_terminals 1
end
set -l pm (_fish_deps_detect_pm)
set -l installed_any 0
set -l skipped_optional 0
set -l skipped_terminals 0
set -l i 1
for bin in $_fdc_bins
# Optional-tier deps are opt-in: skip unless --optional/--all was passed.
if test "$_fdc_tiers[$i]" = opt; and test $include_optional -eq 0
if not command -q $bin
set skipped_optional (math $skipped_optional + 1)
end
set i (math $i + 1)
continue
end
# Terminal-emulator-tier deps are opt-in: skip unless --terminals/--all was passed.
if test "$_fdc_tiers[$i]" = term; and test $include_terminals -eq 0
if not command -q $bin
set skipped_terminals (math $skipped_terminals + 1)
end
set i (math $i + 1)
continue
end
# Determine if this dep needs attention: missing, or fish < 4.0
set -l needs_install 0
set -l upgrade_label Install
@@ -81,6 +126,15 @@ function _fish_deps_install
case wakatime-binary
set -a methods special-wakatime
set -a method_labels "binary download (github releases)"
case go-ov
if type -q go
set -a methods special-go-ov
set -a method_labels "go install (github.com/noborus/ov@latest)"
else
set_color brblack
echo " note: go not found — install go first for the latest $bin (not all distros package $bin in their base repos)"
set_color normal
end
end
# System PM — after cargo and preferred specials
@@ -172,6 +226,25 @@ function _fish_deps_install
echo " cargo not yet in PATH — restart your shell if subsequent installs fail."
set_color normal
end
case special-go-ov
go install github.com/noborus/ov@latest
set -l _go_status $status
# go install places binaries in $GOBIN, falling back to
# $GOPATH/bin (default ~/go/bin) — ask go itself rather
# than guessing, since GOPATH may be customized.
set -l _gobin (go env GOBIN)
if test -z "$_gobin"
set _gobin (go env GOPATH)/bin
end
if test -d "$_gobin"
fish_add_path "$_gobin"
end
if test $_go_status -eq 0; and not type -q ov
set_color yellow
echo " ov not yet in PATH — restart your shell if subsequent installs fail."
set_color normal
end
test $_go_status -eq 0
case special-lazydocker
curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash
case special-wakatime
@@ -272,4 +345,20 @@ function _fish_deps_install
if test $installed_any -eq 0
echo "Nothing to install."
end
if test $skipped_optional -gt 0
set -l _plural dependencies
test $skipped_optional -eq 1; and set _plural dependency
set_color brblack
echo "Skipped $skipped_optional optional $_plural. Run 'fish-deps install --optional' to include them."
set_color normal
end
if test $skipped_terminals -gt 0
set -l _plural "terminal emulators"
test $skipped_terminals -eq 1; and set _plural "terminal emulator"
set_color brblack
echo "Skipped $skipped_terminals $_plural. Run 'fish-deps install --terminals' to include them."
set_color normal
end
end
functions/_fish_deps_status.fish
+9 -3
View File
@@ -6,7 +6,8 @@
#
# DESCRIPTION
# Prints a colored installed/missing status report for all managed fish shell
# dependencies, grouped by tier (required, integrations, recommended).
# dependencies, grouped by tier (required, recommended, optional, terminal
# emulators, integrations).
#
# EXAMPLE
# _fish_deps_status
@@ -31,18 +32,23 @@ function _fish_deps_status
set_color green; echo -n " ✓ "; set_color normal
echo -n "$bin "
set_color brblack; echo "(Found at "(__fish_real_command $bin)")"; set_color normal
else if test "$tier" = req
set_color red; echo -n " ✗ "; set_color normal
echo -n "$bin "
set_color brblack; echo "(Not installed)"; set_color normal
else if test "$tier" = rec
set_color yellow; echo -n " ⚠ "; set_color normal
echo -n "$bin "
set_color brblack; echo "(Not installed)"; set_color normal
else
set_color red; echo -n " ✗ "; set_color normal
# opt / term / int: absence is expected and not alarming
set_color brblack; echo -n " – "; set_color normal
echo -n "$bin "
set_color brblack; echo "(Not installed)"; set_color normal
end
end
for tier_label in "Required Dependencies:req" "Integrations:int" "Recommended Dependencies:rec"
for tier_label in "Required Dependencies:req" "Recommended Dependencies:rec" "Optional Dependencies:opt" "Terminal Emulators:term" "Integrations:int"
set -l label (string split : $tier_label)[1]
set -l tier (string split : $tier_label)[2]
set_color cyan; echo $label; set_color normal
functions/_fish_deps_update.fish
+15
View File
@@ -72,6 +72,21 @@ function _fish_deps_update
continue
end
# ov: prefer go install (always fetches latest); fall back to system PM
if test "$special" = go-ov
if type -q go
echo "Updating $bin..."
go install github.com/noborus/ov@latest
set updated_any 1
else if test -n "$pm_pkg"; and test -n "$pm"
echo "Updating $bin (go unavailable, using system PM)..."
_fish_deps_pm_upgrade $pm_pkg
set updated_any 1
end
set i (math $i + 1)
continue
end
# lazydocker: re-run the official install/update script
if test "$special" = curl-lazydocker
echo "Updating $bin..."
functions/fish-deps.fish
+36 -17
View File
@@ -5,7 +5,7 @@
# 06-dependency-management
#
# SYNOPSIS
# fish-deps [status|install|update|sync]
# fish-deps [status|install|update|sync] [--optional] [--terminals] [--all]
#
# DESCRIPTION
# Unified command for managing all tools this configuration depends on,
@@ -21,19 +21,29 @@
#
# When multiple methods are available you are prompted to choose.
#
# Dependencies are grouped into three tiers:
# Dependencies are grouped into five tiers:
#
# Required fish, fzf, zoxide
# Integrations wakatime, tailscale
# Recommended cargo, starship, uv, direnv, paru, yay, eza, lsd, bat,
# btop, dust, duf, prettyping, ov, ripgrep, lazygit,
# lazydocker, trash, kitty, wezterm, python3, yt-dlp
# Required fish, fzf
# Recommended cargo, starship, uv, zoxide, direnv, paru, yay,
# eza, lsd, bat, ov, ripgrep, trash, python3
# Optional btop, dust, duf, prettyping, go, lazygit,
# lazydocker, docker, yt-dlp, screen — single-purpose
# wrapper conveniences that only matter if you
# already use that tool; skipped by `install`/`sync`
# unless --optional (or --all) is passed
# Terminal Emulators kitty, wezterm — only matter if one of them is
# your actual terminal; skipped by `install`/`sync`
# unless --terminals (or --all) is passed
# Integrations wakatime, tailscale
#
# ARGUMENTS
# status Report installed/missing deps (default)
# install Install missing deps interactively
# update Update all installed deps
# sync Install missing deps, then update all
# status Report installed/missing deps (default)
# install Install missing deps interactively
# update Update all installed deps
# sync Install missing deps, then update all
# --optional With install/sync: also offer Optional-tier deps
# --terminals With install/sync: also offer Terminal-Emulator-tier deps
# --all With install/sync: shorthand for --optional --terminals
#
# EXIT STATUS
# 0 Subcommand completed
@@ -43,20 +53,24 @@
# fish-deps sync
# fish-deps
# fish-deps install
# fish-deps install --optional
# fish-deps install --terminals
# fish-deps install --all
# fish-deps update
function fish-deps --description 'Manage fish shell dependencies'
set -l subcmd $argv[1]
set -l flags $argv[2..]
switch $subcmd
case status ''
_fish_deps_status
case install
_fish_deps_install
_fish_deps_install $flags
case update
_fish_deps_update
case sync
echo "=== Installing missing deps ==="
_fish_deps_install
_fish_deps_install $flags
echo ""
echo "=== Updating installed deps ==="
_fish_deps_update
@@ -82,10 +96,15 @@ function __fish_deps_help
set_color cyan; echo "fish-deps — manage fish shell dependencies"; set_color normal
echo ""
echo "Usage:"
echo " fish-deps [status] Check installed/missing deps (default)"
echo " fish-deps install Install missing deps interactively"
echo " fish-deps update Update all installed deps"
echo " fish-deps sync Install missing, then update all"
echo " fish-deps [status] Check installed/missing deps (default)"
echo " fish-deps install Install missing deps interactively"
echo " fish-deps update Update all installed deps"
echo " fish-deps sync Install missing, then update all"
echo ""
echo " install/sync accept:"
echo " --optional Also offer Optional-tier deps (skipped by default)"
echo " --terminals Also offer Terminal-Emulator-tier deps (skipped by default)"
echo " --all Shorthand for --optional --terminals"
echo ""
echo "Install method priority: cargo > system PM > git/curl/pipx"
echo "When multiple methods are available, you will be prompted to choose."
functions/fish_right_prompt.fish
+7 -6
View File
@@ -9,10 +9,9 @@
#
# DESCRIPTION
# Renders the right-side prompt. Always shows a dim timestamp. When the last
# command failed, prefixes it with a red ✘ and the exit code. When starship
# is installed and C3 overrides are enabled, also shows the active Docker
# context (if non-default) — that block is paired with the starship prompt
# which already guards on both conditions.
# command failed, prefixes it with a red ✘ and the exit code. When docker
# and starship are both installed and C3 overrides are enabled, also shows
# the active Docker context (if non-default).
#
# EXIT STATUS
# 0 Always
@@ -29,8 +28,10 @@ function fish_right_prompt
set_color normal
end
# Docker context — only relevant alongside the starship prompt
if type -q starship; and __fish_config_op_enabled __fish_config_op_overrides
# Docker context — only relevant alongside the starship prompt, and only
# when docker is actually installed (guarded like every other optional
# integration in this config).
if type -q docker; and type -q starship; and __fish_config_op_enabled __fish_config_op_overrides
set -l docker_ctx (docker context show 2>/dev/null)
if test -n "$docker_ctx"; and test "$docker_ctx" != default
set_color blue
functions/ld.fish
+12
View File
@@ -11,9 +11,21 @@
# Launches lazydocker targeting the currently active Docker context by
# resolving the host endpoint from docker context inspect.
#
# EXIT STATUS
# 1 docker or lazydocker is not installed
#
# EXAMPLE
# ld
function ld --description 'Run lazydocker on the current Docker context'
if not type -q docker
echo "ld: docker is not installed" >&2
return 1
end
if not type -q lazydocker
echo "ld: lazydocker is not installed" >&2
return 1
end
# Fetch the host endpoint of the currently active Docker context
set -l current_host (docker context inspect --format '{{.Endpoints.docker.Host}}')