From 5c224694ec0ab0c47140ff2f4edf8598a982ed4d Mon Sep 17 00:00:00 2001 From: rootiest Date: Thu, 11 Jun 2026 23:36:50 -0400 Subject: [PATCH] fix(deps): demote direnv to recommended direnv integration is fully guarded with type -q direnv in config.fish. The auto-venv script checks $DIRENV_DIR (set at runtime), not the binary. Without direnv installed the hook simply never loads and venv activation fires normally. No functionality breaks. --- docs/fish-config.md | 8 +++++--- functions/_fish_deps_catalog.fish | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/fish-config.md b/docs/fish-config.md index b9b7086..b0aac91 100644 --- a/docs/fish-config.md +++ b/docs/fish-config.md @@ -850,9 +850,9 @@ Add -i (interactive confirmation) to destructive commands: Dependencies are grouped into three tiers: - Required cargo, fish, fisher, starship, fzf, zoxide, direnv + Required cargo, fish, fisher, starship, fzf, zoxide Integrations wakatime, tailscale - Recommended uv, paru, yay, eza, lsd, bat, btop, dust, duf, + Recommended uv, direnv, paru, yay, eza, lsd, bat, btop, dust, duf, prettyping, ov, ripgrep, lazygit, lazydocker, trash, kitty, wezterm, python3 @@ -1353,7 +1353,6 @@ fish-deps manages these tools. Run `fish-deps` to check status, or starship Cross-shell prompt fzf Fuzzy finder zoxide Smart cd with frecency - direnv Per-directory environment loading ## Integrations @@ -1365,6 +1364,9 @@ fish-deps manages these tools. Run `fish-deps` to check status, or uv Python package and project manager (Astral); used by the fish-from-source build path in fish-deps. All consumers degrade gracefully without it. + direnv Per-directory environment loading; integration is fully + guarded with type -q direnv. Without it the direnv hook + is simply not loaded and auto-venv activates normally. paru AUR helper (Arch only; preferred); guarded throughout — non-Arch systems silently skip AUR-specific paths. yay AUR helper (Arch only; fallback to paru); same guards apply. diff --git a/functions/_fish_deps_catalog.fish b/functions/_fish_deps_catalog.fish index 78a9467..9af2637 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 \ - rec req req req req req req req rec rec \ + rec req req req req req req rec rec rec \ int int \ rec rec rec rec rec rec rec rec rec rec rec rec rec rec rec