fix(deps): demote uv to recommended, remove dead pipx installer code
uv is only used in the fish-deps fish-from-source build path (uv run --no-managed-python cargo install --path .) and is not required by the config at runtime. All consumers degrade gracefully without it. pipx appeared in the installer's method-building and execution switch blocks but no catalog entry ever sets special=pipx, making both branches permanently unreachable dead code. The docs listed pipx as install priority #6 which was equally misleading. - _fish_deps_catalog: change uv tier from req → rec - _fish_deps_install: remove case pipx method-builder and special-pipx / special-pip execution cases - docs/fish-config.md: move uv from Required to Recommended catalog entry with accurate description; drop pipx from install priority list and tier summary
This commit is contained in:
+5
-5
@@ -845,16 +845,15 @@ Add -i (interactive confirmation) to destructive commands:
|
|||||||
3. system PM (paru/apt/brew/etc.)
|
3. system PM (paru/apt/brew/etc.)
|
||||||
4. git clone (fzf)
|
4. git clone (fzf)
|
||||||
5. curl installer (starship, fisher, uv)
|
5. curl installer (starship, fisher, uv)
|
||||||
6. pipx (Python tools)
|
|
||||||
|
|
||||||
When multiple methods are available you are prompted to choose.
|
When multiple methods are available you are prompted to choose.
|
||||||
|
|
||||||
Dependencies are grouped into three tiers:
|
Dependencies are grouped into three tiers:
|
||||||
|
|
||||||
Required uv, cargo, fish, fisher, starship, fzf, zoxide,
|
Required cargo, fish, fisher, starship, fzf, zoxide,
|
||||||
direnv, paru/yay
|
direnv, paru/yay
|
||||||
Integrations wakatime, tailscale
|
Integrations wakatime, tailscale
|
||||||
Recommended eza, lsd, bat, btop, dust, duf, prettyping, ov,
|
Recommended uv, eza, lsd, bat, btop, dust, duf, prettyping, ov,
|
||||||
ripgrep, lazygit, lazydocker, trash, kitty, wezterm,
|
ripgrep, lazygit, lazydocker, trash, kitty, wezterm,
|
||||||
python3
|
python3
|
||||||
|
|
||||||
@@ -1349,7 +1348,6 @@ fish-deps manages these tools. Run `fish-deps` to check status, or
|
|||||||
|
|
||||||
## Required
|
## Required
|
||||||
|
|
||||||
uv Python package manager (Astral)
|
|
||||||
cargo Rust toolchain (via rustup)
|
cargo Rust toolchain (via rustup)
|
||||||
fish Fish shell >= 4.0
|
fish Fish shell >= 4.0
|
||||||
fisher Fish plugin manager
|
fisher Fish plugin manager
|
||||||
@@ -1367,6 +1365,9 @@ fish-deps manages these tools. Run `fish-deps` to check status, or
|
|||||||
|
|
||||||
## Recommended
|
## Recommended
|
||||||
|
|
||||||
|
uv Python package and project manager (Astral); used by the
|
||||||
|
fish-from-source build path in fish-deps. All consumers
|
||||||
|
degrade gracefully without it.
|
||||||
eza Modern ls replacement
|
eza Modern ls replacement
|
||||||
lsd ls replacement (fallback to eza)
|
lsd ls replacement (fallback to eza)
|
||||||
bat Syntax-highlighted cat
|
bat Syntax-highlighted cat
|
||||||
@@ -1396,7 +1397,6 @@ The install priority for each tool:
|
|||||||
system PM paru / apt / brew / dnf / etc. — for tools without a crate
|
system PM paru / apt / brew / dnf / etc. — for tools without a crate
|
||||||
git clone fzf — installed from GitHub to ~/.fzf/
|
git clone fzf — installed from GitHub to ~/.fzf/
|
||||||
curl starship installer, fisher bootstrap, uv installer
|
curl starship installer, fisher bootstrap, uv installer
|
||||||
pipx Python-based tools
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ function _fish_deps_catalog
|
|||||||
eza lsd bat btop dust duf prettyping ov rg lazygit lazydocker trash kitty wezterm python3
|
eza lsd bat btop dust duf prettyping ov rg lazygit lazydocker trash kitty wezterm python3
|
||||||
|
|
||||||
set -g _fdc_tiers \
|
set -g _fdc_tiers \
|
||||||
req req req req req req req req rec rec \
|
rec req req req req req req req rec 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 rec rec
|
||||||
|
|
||||||
|
|||||||
@@ -117,14 +117,6 @@ function _fish_deps_install
|
|||||||
set -a methods special-yay
|
set -a methods special-yay
|
||||||
set -a method_labels "build from AUR (makepkg)"
|
set -a method_labels "build from AUR (makepkg)"
|
||||||
end
|
end
|
||||||
case pipx
|
|
||||||
if type -q pipx
|
|
||||||
set -a methods special-pipx
|
|
||||||
set -a method_labels "pipx ($bin)"
|
|
||||||
else if type -q pip
|
|
||||||
set -a methods special-pip
|
|
||||||
set -a method_labels "pip install --user ($bin)"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if test (count $methods) -eq 0
|
if test (count $methods) -eq 0
|
||||||
@@ -264,10 +256,6 @@ function _fish_deps_install
|
|||||||
popd 2>/dev/null
|
popd 2>/dev/null
|
||||||
rm -rf "$_tmpdir"
|
rm -rf "$_tmpdir"
|
||||||
test $_build_ok -eq 1
|
test $_build_ok -eq 1
|
||||||
case special-pipx
|
|
||||||
pipx install $bin
|
|
||||||
case special-pip
|
|
||||||
pip install --user $bin
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if test $status -eq 0
|
if test $status -eq 0
|
||||||
|
|||||||
Reference in New Issue
Block a user