Merge pull request 'feat(deps): add fish-deps unified dependency management command' (#17) from feat/fish-deps into main

Reviewed-on: #17

README.md

@@ -254,7 +254,10 @@ rm -f file.txt  # Falls through to standard rm -f
 | `fzf-update` | Install or upgrade fzf from git HEAD into `~/.fzf` (guarantees the latest build) |
 | `check_fish_deps` | Legacy alias — delegates to `fish-deps status` |
 
-Install method priority: **cargo** (for Rust tools, gets latest crate) → **system PM** (paru/apt/brew/etc.) → **git clone** (fzf) → **curl installer** (starship, fisher) → **pipx** (Python tools). When multiple methods are available for a tool, you are prompted to choose.
+Install method priority: **git+cargo source build** (fish) → **cargo** (other Rust tools, gets latest crate) → **system PM** (paru/apt/brew/etc.) → **git clone** (fzf) → **curl installer** (starship, fisher) → **pipx** (Python tools). When multiple methods are available for a tool, you are prompted to choose.
+
+> [!NOTE]
+> Upgrading Fish from source requires **cargo** and **[uv](https://docs.astral.sh/uv/)**. Both are managed dependencies — `fish-deps install` will offer to install them before attempting the Fish build. If both are unavailable, `fish-deps update` falls back to the system package manager.
 
 ### Docker
 
@@ -493,6 +496,8 @@ Named context shortcuts (e.g. `dcr`, `dck`) live in `~/.config/.user-dots/fish/l
 
 | Tool | Version | Purpose |
 |---|---|---|
+| [uv](https://docs.astral.sh/uv/) | any | Python runner (needed to build Fish from source) |
+| [Rust / cargo](https://www.rust-lang.org/tools/install) | any | Installs Rust-based tools; required to build Fish |
 | [Fish](https://fishshell.com/) | **≥ 4.0** | Shell |
 | [Fisher](https://github.com/jorgebucaran/fisher) | any | Plugin manager |
 | [Starship](https://starship.rs/) | any | Prompt |
@@ -502,11 +507,7 @@ Named context shortcuts (e.g. `dcr`, `dck`) live in `~/.config/.user-dots/fish/l
 
 > [!WARNING]
 > Fish **4.0 or newer is required.** This config uses `test` syntax and other constructs that are incompatible with Fish 3.x. Older versions will produce errors on startup.
-> If you are on an older Fish, you can upgrade via cargo (Fish 4.x is a Rust rewrite published to crates.io):
+> Run `fish-deps install` or `fish-deps update` to upgrade — it will install `uv` and `cargo` automatically if missing, then build the latest Fish from source.
-> ```
-> cargo install fish
-> ```
-> Or run `fish-deps update` once cargo is available — it will upgrade Fish via cargo automatically.
 
 ### Recommended
 

functions/_fish_deps_catalog.fish

@@ -10,34 +10,35 @@
 #   _fdc_cargo   — cargo crate name, or "" if not on crates.io
 #   _fdc_pm      — system PM package name, or "" if not in repos
 #   _fdc_special — special install key: rustup-installer | fisher-bootstrap |
-#                  fzf-update | paru-build | pipx | curl-installer | "" (none)
+#                  fzf-update | paru-build | pipx | curl-installer |
+#                  git-cargo-fish | curl-uv | "" (none)
 #
-# cargo is listed second so it is installed before Rust tools that depend on it.
+# uv and cargo are listed first so both are available before fish and other Rust tools.
 function _fish_deps_catalog
     set -g _fdc_bins \
-        fish cargo fisher starship fzf zoxide direnv paru \
+        uv cargo fish fisher starship fzf zoxide direnv paru \
         wakatime tailscale \
         eza lsd bat btop dust duf prettyping most rg lazygit lazydocker trash kitty wezterm
 
     set -g _fdc_tiers \
-        req req req req req req req rec \
+        req req req req req req req req rec \
         int int \
         rec rec rec rec rec rec rec rec rec rec rec rec rec rec
 
     set -g _fdc_cargo \
-        fish "" "" starship "" zoxide "" "" \
+        "" "" "" "" starship "" zoxide "" "" \
         "" "" \
-        eza lsd bat "" du-dust "" "" "" ripgrep "" "" trash-cli "" ""
+        eza lsd bat "" du-dust "" "" "" ripgrep "" "" trashy "" ""
 
     set -g _fdc_pm \
-        fish cargo "" starship fzf zoxide direnv "" \
+        uv cargo fish "" starship fzf zoxide direnv "" \
         wakatime tailscale \
         eza lsd bat btop dust duf prettyping most ripgrep lazygit lazydocker trash kitty wezterm
 
     set -g _fdc_special \
-        "" rustup-installer fisher-bootstrap curl-installer fzf-update "" "" paru-build \
+        curl-uv rustup-installer git-cargo-fish fisher-bootstrap curl-installer fzf-update "" "" paru-build \
-        pipx "" \
+        wakatime-binary "" \
-        "" "" "" "" "" "" "" "" "" "" "" "" "" ""
+        "" "" "" "" "" "" "" "" "" "" curl-lazydocker "" "" ""
 end
 
 # Returns the index (1-based) of $argv[1] in the catalog, or "" if not found.

functions/_fish_deps_install.fish

@@ -11,7 +11,20 @@ function _fish_deps_install
 
     set -l i 1
     for bin in $_fdc_bins
+        # Determine if this dep needs attention: missing, or fish < 4.0
+        set -l needs_install 0
+        set -l upgrade_label Install
         if not type -q $bin
+            set needs_install 1
+        else if test "$bin" = fish
+            set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2]
+            if test -n "$_major"; and test "$_major" -lt 4
+                set needs_install 1
+                set upgrade_label "Upgrade"
+            end
+        end
+
+        if test $needs_install -eq 1
             set -l cargo_crate  $_fdc_cargo[$i]
             set -l pm_pkg       $_fdc_pm[$i]
             set -l special      $_fdc_special[$i]
@@ -32,19 +45,41 @@ function _fish_deps_install
                 end
             end
 
-            # rustup installer — listed before system PM so it is the default for cargo itself
+            # Preferred special methods — listed before system PM so they are the default
-            if test "$special" = rustup-installer
+            switch $special
-                set -a methods special-rustup
+                case curl-uv
-                set -a method_labels "rustup installer (curl | sh)"
+                    set -a methods special-uv
+                    set -a method_labels "curl installer (official script)"
+                case git-cargo-fish
+                    if type -q cargo; and type -q uv
+                        set -a methods special-git-cargo-fish
+                        set -a method_labels "build from source (git + cargo)"
+                    else
+                        set_color brblack
+                        set -l _need
+                        type -q cargo; or set -a _need cargo
+                        type -q uv; or set -a _need uv
+                        echo "  note: "(string join " and " $_need)" not found — install them first to build fish from source"
+                        set_color normal
+                    end
+                case rustup-installer
+                    set -a methods special-rustup
+                    set -a method_labels "rustup installer (curl | sh)"
+                case curl-lazydocker
+                    set -a methods special-lazydocker
+                    set -a method_labels "curl installer (official script)"
+                case wakatime-binary
+                    set -a methods special-wakatime
+                    set -a method_labels "binary download (github releases)"
             end
 
-            # System PM — after cargo/rustup so those are always the default when available
+            # System PM — after cargo and preferred specials
             if test -n "$pm_pkg"; and test -n "$pm"
                 set -a methods pm
                 set -a method_labels "$pm ($pm_pkg)"
             end
 
-            # Remaining special methods
+            # Supplemental special methods (fallbacks, Arch-only, etc.)
             switch $special
                 case fzf-update
                     set -a methods special-fzf
@@ -83,8 +118,8 @@ function _fish_deps_install
                 continue
             end
 
-            # Prompt: install this dep?
+            # Prompt: install/upgrade this dep?
-            read -l -P (set_color cyan)"Install $bin?"(set_color normal)" [Y/n] " _reply
+            read -l -P (set_color cyan)"$upgrade_label $bin?"(set_color normal)" [Y/n] " _reply
             if test "$_reply" = n; or test "$_reply" = N
                 set i (math $i + 1)
                 continue
@@ -101,11 +136,11 @@ function _fish_deps_install
                     set m (math $m + 1)
                 end
                 read -l -P "  Choose [1-"(count $methods)"] (default 1 = $method_labels[1]): " _choice
-                if test -n "$_choice"; and test "$_choice" -ge 1; and test "$_choice" -le (count $methods)
+                if string match -qr '^\d+$' "$_choice"; and test "$_choice" -ge 1; and test "$_choice" -le (count $methods)
                     set chosen_method $methods[$_choice]
                 end
             else
-                set_color brblack; echo "  Installing via $method_labels[1]"; set_color normal
+                set_color brblack; echo "  "(string lower $upgrade_label)"ing via $method_labels[1]"; set_color normal
             end
 
             # Execute chosen method
@@ -116,6 +151,46 @@ function _fish_deps_install
                     _fish_deps_pm_install $pm_pkg
                 case special-rustup
                     curl https://sh.rustup.rs -sSf | sh
+                    # Add cargo to PATH for the rest of this session without restarting.
+                    # Try CARGO_HOME first (set in config.fish), then the rustup default.
+                    for _d in "$CARGO_HOME/bin" "$HOME/.cargo/bin"
+                        if test -d "$_d"
+                            fish_add_path "$_d"
+                            break
+                        end
+                    end
+                    if not type -q cargo
+                        set_color yellow
+                        echo "  cargo not yet in PATH — restart your shell if subsequent installs fail."
+                        set_color normal
+                    end
+                case special-lazydocker
+                    curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash
+                case special-wakatime
+                    set -l _arch (uname -m)
+                    switch $_arch
+                        case x86_64
+                            set _arch amd64
+                        case aarch64 arm64
+                            set _arch arm64
+                        case armv7l
+                            set _arch arm
+                        case '*'
+                            set _arch amd64
+                    end
+                    set -l _zip "wakatime-cli-linux-$_arch.zip"
+                    set -l _bin_src "wakatime-cli-linux-$_arch"
+                    set -l _wt_dir "$HOME/.config/wakatime"
+                    set -l _wt_bin "$_wt_dir/wakatime"
+                    set -l _tmpdir (mktemp -d)
+                    curl -L "https://github.com/wakatime/wakatime-cli/releases/latest/download/$_zip" \
+                        -o "$_tmpdir/$_zip"
+                    and unzip -o "$_tmpdir/$_zip" -d "$_tmpdir"
+                    and mkdir -p "$_wt_dir" "$HOME/.local/bin"
+                    and cp "$_tmpdir/$_bin_src" "$_wt_bin"
+                    and chmod +x "$_wt_bin"
+                    and ln -sf "$_wt_bin" "$HOME/.local/bin/wakatime"
+                    rm -rf "$_tmpdir"
                 case special-fzf
                     fzf-update
                 case special-fisher
@@ -134,6 +209,35 @@ function _fish_deps_install
                     and makepkg -si --noconfirm
                     and popd
                     rm -rf $_build_dir
+                case special-uv
+                    curl -LsSf https://astral.sh/uv/install.sh | sh
+                    # Add uv to PATH for the rest of this session
+                    for _d in "$HOME/.local/bin" "$HOME/.cargo/bin"
+                        if test -d "$_d"
+                            fish_add_path "$_d"
+                            break
+                        end
+                    end
+                    if not type -q uv
+                        set_color yellow
+                        echo "  uv not yet in PATH — restart your shell if subsequent installs fail."
+                        set_color normal
+                    end
+                case special-git-cargo-fish
+                    set -l _tmpdir (mktemp -d)
+                    set -l _build_ok 0
+                    git clone https://github.com/fish-shell/fish-shell "$_tmpdir"
+                    and begin
+                        set -l _tag (git -C "$_tmpdir" tag --list 'fish-*' --sort=version:refname | tail -1)
+                        test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag"
+                        true
+                    end
+                    and pushd "$_tmpdir"
+                    and uv run --no-managed-python cargo install --path .
+                    and set _build_ok 1
+                    popd 2>/dev/null
+                    rm -rf "$_tmpdir"
+                    test $_build_ok -eq 1
                 case special-pipx
                     pipx install $bin
                 case special-pip
@@ -142,9 +246,14 @@ function _fish_deps_install
 
             if test $status -eq 0
                 set installed_any 1
-                set_color green; echo "  $bin installed."; set_color normal
+                set_color green; echo "  $bin "(string lower $upgrade_label)"ed."; set_color normal
+                if test "$bin" = fish
+                    set_color yellow
+                    echo "  Fish upgraded — restart your shell to use the new version."
+                    set_color normal
+                end
             else
-                set_color red; echo "  $bin install failed."; set_color normal
+                set_color red; echo "  $bin "(string lower $upgrade_label)" failed."; set_color normal
             end
         end
         set i (math $i + 1)

functions/_fish_deps_status.fish

@@ -7,6 +7,17 @@ function _fish_deps_status
 
     function __fds_print_dep --argument-names bin tier
         if type -q $bin
+            # Special version check: fish < 4.0 is functionally incompatible
+            if test "$bin" = fish
+                set -l _major (fish --version 2>&1 | string match -r 'version (\d+)')[2]
+                if test -n "$_major"; and test "$_major" -lt 4
+                    set -l _ver (fish --version 2>&1 | string replace 'fish, ' '')
+                    set_color yellow; echo -n " ⚠ "; set_color normal
+                    echo -n "$bin "
+                    set_color brblack; echo "($_ver — upgrade to 4.0+ required)"; set_color normal
+                    return
+                end
+            end
             set_color green; echo -n " ✓ "; set_color normal
             echo -n "$bin "
             set_color brblack; echo "(Found at "(type -p $bin)")"; set_color normal

functions/_fish_deps_update.fish

@@ -48,6 +48,40 @@ function _fish_deps_update
             continue
         end
 
+        # lazydocker: re-run the official install/update script
+        if test "$special" = curl-lazydocker
+            echo "Updating $bin..."
+            curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash
+            set updated_any 1
+            set i (math $i + 1)
+            continue
+        end
+
+        # wakatime: re-download the binary from github releases
+        if test "$special" = wakatime-binary
+            echo "Updating $bin..."
+            set -l _arch (uname -m)
+            switch $_arch
+                case x86_64;  set _arch amd64
+                case aarch64 arm64; set _arch arm64
+                case armv7l;  set _arch arm
+                case '*';     set _arch amd64
+            end
+            set -l _zip "wakatime-cli-linux-$_arch.zip"
+            set -l _bin_src "wakatime-cli-linux-$_arch"
+            set -l _wt_bin "$HOME/.config/wakatime/wakatime"
+            set -l _tmpdir (mktemp -d)
+            curl -L "https://github.com/wakatime/wakatime-cli/releases/latest/download/$_zip" \
+                -o "$_tmpdir/$_zip"
+            and unzip -o "$_tmpdir/$_zip" -d "$_tmpdir"
+            and cp "$_tmpdir/$_bin_src" "$_wt_bin"
+            and chmod +x "$_wt_bin"
+            rm -rf "$_tmpdir"
+            and set updated_any 1
+            set i (math $i + 1)
+            continue
+        end
+
         # pipx tools
         if test "$special" = pipx
             if type -q pipx
@@ -59,11 +93,59 @@ function _fish_deps_update
             continue
         end
 
+        # uv: use built-in self-updater
+        if test "$special" = curl-uv
+            echo "Updating $bin..."
+            uv self update
+            set updated_any 1
+            set i (math $i + 1)
+            continue
+        end
+
+        # fish: prefer build from source via git + cargo; fall back to PM
+        if test "$special" = git-cargo-fish
+            if type -q cargo; and type -q uv
+                echo "Updating $bin..."
+                set -l _tmpdir (mktemp -d)
+                set -l _build_ok 0
+                git clone https://github.com/fish-shell/fish-shell "$_tmpdir"
+                and begin
+                    set -l _tag (git -C "$_tmpdir" tag --list 'fish-*' --sort=version:refname | tail -1)
+                    test -n "$_tag"; and git -C "$_tmpdir" checkout "$_tag"
+                    true
+                end
+                and pushd "$_tmpdir"
+                and uv run --no-managed-python cargo install --path .
+                and set _build_ok 1
+                popd 2>/dev/null
+                rm -rf "$_tmpdir"
+                if test $_build_ok -eq 1
+                    set updated_any 1
+                    set_color yellow
+                    echo "  Fish updated — restart your shell to use the new version."
+                    set_color normal
+                end
+            else if test -n "$pm_pkg"; and test -n "$pm"
+                echo "Updating $bin (cargo/uv unavailable, using system PM)..."
+                _fish_deps_pm_upgrade $pm_pkg
+                set updated_any 1
+                set_color yellow
+                echo "  Fish updated — restart your shell to use the new version."
+                set_color normal
+            else
+                set_color yellow
+                echo "  fish: cannot update — install cargo and uv to build from source"
+                set_color normal
+            end
+            set i (math $i + 1)
+            continue
+        end
+
         # curl-installer tools (starship etc.): re-run install script, which upgrades in place
         if test "$special" = curl-installer
             if test "$bin" = starship
                 echo "Updating $bin..."
-                curl -sS https://starship.rs/install.sh | sh -- --yes
+                curl -sS https://starship.rs/install.sh | sh -s -- --yes
                 set updated_any 1
             end
             set i (math $i + 1)
@@ -75,11 +157,6 @@ function _fish_deps_update
             echo "Updating $bin..."
             cargo install --force $cargo_crate
             set updated_any 1
-            if test "$bin" = fish
-                set_color yellow
-                echo "  Fish updated — restart your shell to use the new version."
-                set_color normal
-            end
             set i (math $i + 1)
             continue
         end