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

feat(deps): add cargo as a managed dependency with rustup installer

Browse Source 
cargo is now the second entry in the catalog (after fish) so it is
installed before any Rust tool that depends on it. Install preference:
rustup installer (curl | sh) first, system PM as fallback. Update
runs rustup update when rustup is available.

The rustup-installer special is evaluated before the system PM in the
method list so it is always option 1 / the default for cargo.
This commit is contained in:
Rootiest
2026-05-18 22:18:57 -04:00
parent abbbf20b40
commit df7c921bc6
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/_fish_deps_catalog.fish
+10 -8
View File
@@ -2,38 +2,40 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
# Populates parallel arrays describing every managed dependency. # Populates parallel arrays describing every managed dependency.
# Callers must invoke this function before accessing _fdc_* variables. # Callers must invoke this function before accessing _fdc_* arrays.
# #
# Array layout (same index across all sets): # Array layout (same index across all sets):
# _fdc_bins — binary name (what `type -q` checks) # _fdc_bins — binary name (what `type -q` checks)
# _fdc_tiers — req | int | rec # _fdc_tiers — req | int | rec
# _fdc_cargo — cargo crate name, or "" if not on crates.io # _fdc_cargo — cargo crate name, or "" if not on crates.io
# _fdc_pm — system PM package name, or "" if not in repos # _fdc_pm — system PM package name, or "" if not in repos
# _fdc_special — special install key: fisher-bootstrap | fzf-update | # _fdc_special — special install key: rustup-installer | fisher-bootstrap |
# pipx | curl-installer | "" (none) # fzf-update | paru-build | pipx | curl-installer | "" (none)
#
# cargo is listed second so it is installed before Rust tools that depend on it.
function _fish_deps_catalog function _fish_deps_catalog
set -g _fdc_bins \ set -g _fdc_bins \
fish fisher starship fzf zoxide direnv paru \ fish cargo fisher starship fzf zoxide direnv paru \
wakatime tailscale \ wakatime tailscale \
eza lsd bat btop dust duf prettyping most rg lazygit lazydocker trash kitty wezterm eza lsd bat btop dust duf prettyping most rg lazygit lazydocker trash kitty wezterm
set -g _fdc_tiers \ set -g _fdc_tiers \
req req req req req req rec \ req req req req req req req rec \
int int \ int int \
rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec
set -g _fdc_cargo \ set -g _fdc_cargo \
"" "" starship "" zoxide "" "" \ "" "" "" starship "" zoxide "" "" \
"" "" \ "" "" \
eza lsd bat "" du-dust "" "" "" ripgrep "" "" trash-cli "" "" eza lsd bat "" du-dust "" "" "" ripgrep "" "" trash-cli "" ""
set -g _fdc_pm \ set -g _fdc_pm \
fish "" starship fzf zoxide direnv "" \ fish cargo "" starship fzf zoxide direnv "" \
wakatime tailscale \ wakatime tailscale \
eza lsd bat btop dust duf prettyping most ripgrep lazygit lazydocker trash kitty wezterm eza lsd bat btop dust duf prettyping most ripgrep lazygit lazydocker trash kitty wezterm
set -g _fdc_special \ set -g _fdc_special \
"" fisher-bootstrap curl-installer fzf-update "" "" paru-build \ "" rustup-installer fisher-bootstrap curl-installer fzf-update "" "" paru-build \
pipx "" \ pipx "" \
"" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""
end end
functions/_fish_deps_install.fish
+12 -4
View File
@@ -20,25 +20,31 @@ function _fish_deps_install
set -l methods set -l methods
set -l method_labels set -l method_labels
# Cargo first — preferred for Rust tools; gets the latest crate version # Cargo — preferred for Rust tools; gets the latest crate version
if test -n "$cargo_crate" if test -n "$cargo_crate"
if type -q cargo if type -q cargo
set -a methods cargo set -a methods cargo
set -a method_labels "cargo ($cargo_crate)" set -a method_labels "cargo ($cargo_crate)"
else else
set_color brblack set_color brblack
echo " note: cargo not found — install rustup for the latest $bin" echo " note: cargo not found — install cargo first for the latest $bin"
set_color normal set_color normal
end end
end end
# System PM — after cargo so cargo is always the default when available # rustup installer — listed before system PM so it is the default for cargo itself
if test "$special" = rustup-installer
set -a methods special-rustup
set -a method_labels "rustup installer (curl | sh)"
end
# System PM — after cargo/rustup so those are always the default when available
if test -n "$pm_pkg"; and test -n "$pm" if test -n "$pm_pkg"; and test -n "$pm"
set -a methods pm set -a methods pm
set -a method_labels "$pm ($pm_pkg)" set -a method_labels "$pm ($pm_pkg)"
end end
# Special methods # Remaining special methods
switch $special switch $special
case fzf-update case fzf-update
set -a methods special-fzf set -a methods special-fzf
@@ -108,6 +114,8 @@ function _fish_deps_install
cargo install $cargo_crate cargo install $cargo_crate
case pm case pm
_fish_deps_pm_install $pm_pkg _fish_deps_pm_install $pm_pkg
case special-rustup
curl https://sh.rustup.rs -sSf | sh
case special-fzf case special-fzf
fzf-update fzf-update
case special-fisher case special-fisher
functions/_fish_deps_update.fish
+11
View File
@@ -28,6 +28,17 @@ function _fish_deps_update
set -l pm_pkg $_fdc_pm[$i] set -l pm_pkg $_fdc_pm[$i]
set -l special $_fdc_special[$i] set -l special $_fdc_special[$i]
# cargo: update via rustup
if test "$special" = rustup-installer
if type -q rustup
echo "Updating $bin..."
rustup update
set updated_any 1
end
set i (math $i + 1)
continue
end
# fzf: always use fzf-update (git-based) # fzf: always use fzf-update (git-based)
if test "$special" = fzf-update if test "$special" = fzf-update
echo "Updating $bin..." echo "Updating $bin..."