diff --git a/docs/fish-config.md b/docs/fish-config.md index c739c25..fdd4f6f 100644 --- a/docs/fish-config.md +++ b/docs/fish-config.md @@ -845,16 +845,15 @@ Add -i (interactive confirmation) to destructive commands: 3. system PM (paru/apt/brew/etc.) 4. git clone (fzf) 5. curl installer (starship, fisher, uv) - 6. pipx (Python tools) When multiple methods are available you are prompted to choose. Dependencies are grouped into three tiers: - Required uv, cargo, fish, fisher, starship, fzf, zoxide, + Required cargo, fish, fisher, starship, fzf, zoxide, direnv, paru/yay 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, python3 @@ -1349,7 +1348,6 @@ fish-deps manages these tools. Run `fish-deps` to check status, or ## Required - uv Python package manager (Astral) cargo Rust toolchain (via rustup) fish Fish shell >= 4.0 fisher Fish plugin manager @@ -1367,6 +1365,9 @@ fish-deps manages these tools. Run `fish-deps` to check status, or ## 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 lsd ls replacement (fallback to eza) 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 git clone fzf — installed from GitHub to ~/.fzf/ curl starship installer, fisher bootstrap, uv installer - pipx Python-based tools --- diff --git a/functions/_fish_deps_catalog.fish b/functions/_fish_deps_catalog.fish index 17c2946..78a9467 100644 --- a/functions/_fish_deps_catalog.fish +++ b/functions/_fish_deps_catalog.fish @@ -19,7 +19,7 @@ function _fish_deps_catalog eza lsd bat btop dust duf prettyping ov rg lazygit lazydocker trash kitty wezterm python3 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 \ rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec diff --git a/functions/_fish_deps_install.fish b/functions/_fish_deps_install.fish index 928ec81..00a9d2c 100644 --- a/functions/_fish_deps_install.fish +++ b/functions/_fish_deps_install.fish @@ -117,14 +117,6 @@ function _fish_deps_install set -a methods special-yay set -a method_labels "build from AUR (makepkg)" 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 if test (count $methods) -eq 0 @@ -264,10 +256,6 @@ function _fish_deps_install popd 2>/dev/null rm -rf "$_tmpdir" test $_build_ok -eq 1 - case special-pipx - pipx install $bin - case special-pip - pip install --user $bin end if test $status -eq 0