diff --git a/script/install.d/30-mise.sh b/script/install.d/30-mise.sh index 7cc59f5..3ac5121 100755 --- a/script/install.d/30-mise.sh +++ b/script/install.d/30-mise.sh @@ -51,6 +51,10 @@ for tool in "${MISE_RUNTIMES[@]}"; do mise use -g "$tool" done +# Activate mise shims so runtimes (e.g. python3) are available for app installers +eval "$(mise activate bash)" +export PATH="$HOME/.local/share/mise/shims:$PATH" + typeset -a MISE_APPS=( "poetry@2.3.2" "gh@2.86.0" @@ -59,6 +63,7 @@ typeset -a MISE_APPS=( "fzf@latest" "zoxide@latest" "ripgrep@latest" + "fastfetch@latest" ) log_info "Installing apps..." @@ -67,10 +72,6 @@ for tool in "${MISE_APPS[@]}"; do mise use -g "$tool" done -# Activate mise environment for current session -eval "$(mise activate bash)" -export PATH="$HOME/.local/share/mise/shims:$PATH" - # Setup Poetry ZSH completions (XDG compliant) COMPLETIONS_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/completions" mkdir -p "$COMPLETIONS_DIR" @@ -87,3 +88,4 @@ echo "npm $(mise exec -- npm --version)" mise exec -- gh --version mise exec -- terraform --version echo "firebase: $(mise exec -- firebase --version)" +echo "fastfetch: $(mise exec -- fastfetch --version 2>&1 | head -1)" diff --git a/script/install.d/80-fastfetch.sh b/script/install.d/80-fastfetch.sh deleted file mode 100755 index c4542dd..0000000 --- a/script/install.d/80-fastfetch.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# ----------------------------------------------------------------------------- -# Description: -# Install fastfetch (fast system information tool). -# - -# Skip in Codespaces (cosmetic tool) -[[ "$DOTS_ENV" == "codespaces" ]] && { log_pass "Skipping in Codespaces"; return 0; } - -if ! command -v fastfetch &>/dev/null; then - case "$DOTS_PKG" in - apt) - sudo apt-get install -qq fastfetch &>/dev/null - ;; - pacman) - yay -S --noconfirm fastfetch &>/dev/null - ;; - brew) - brew install fastfetch - ;; - *) - log_warn "Skipping fastfetch install: no supported package manager found" - ;; - esac -fi - -echo "fastfetch: $(fastfetch --version 2>&1 | head -1)" diff --git a/tests/test_binaries.py b/tests/test_binaries.py index b74736a..10fb60a 100644 --- a/tests/test_binaries.py +++ b/tests/test_binaries.py @@ -50,7 +50,7 @@ binaries: List[Text] = [ "terraform", "docker" if not os.environ.get("SKIP_DOCKER_CONFIG") else None, "mise", - "neofetch", + "fastfetch", "cmatrix", "az", "firebase",