diff --git a/dotfiles/.aliases b/dotfiles/.aliases index 72718e6..5ed869c 100755 --- a/dotfiles/.aliases +++ b/dotfiles/.aliases @@ -55,8 +55,8 @@ alias egrep='egrep --color=auto' # Get current month number alias month='date +%m' -# Update Zsh plugins and rtx versions -alias update-shell="antidote update; rtx upgrade; rtx prune" +# Update Zsh plugins and mise versions +alias update-shell="antidote update; mise upgrade; mise prune" # Update Homebrew packages alias update-brew='brew update; brew upgrade; brew cleanup' diff --git a/dotfiles/.gitignore_global b/dotfiles/.gitignore_global index f0f17a2..8dc05b6 100755 --- a/dotfiles/.gitignore_global +++ b/dotfiles/.gitignore_global @@ -13,7 +13,7 @@ Thumbs.db .Spotlight-V100 .Trashes -# Exclude any dotenv/direnv/rtx files +# Exclude any dotenv/direnv/mise files .env .envrc -.rtx.toml +.mise.toml diff --git a/dotfiles/.huskyrc b/dotfiles/.huskyrc index 9bec0d4..a1f01ab 100644 --- a/dotfiles/.huskyrc +++ b/dotfiles/.huskyrc @@ -1,7 +1,7 @@ # Runs before husky hooks, in non-interative shell environments like Sourcetree # https://typicode.github.io/husky/troubleshooting.html#command-not-found -# Load rtx and update PATH using hook-env -# https://github.com/jdxcode/rtx#rtx-isnt-working-when-calling-from-tmux-or-another-shell-initialization-script -eval "$(rtx activate bash)" -eval "$(rtx hook-env)" +# Load mise and update PATH using hook-env +# https://mise.jdx.dev/faq.html#mise-isn-t-working-when-calling-from-tmux-or-another-shell-initialization-script +eval "$(mise activate bash)" +eval "$(mise hook-env)" diff --git a/dotfiles/.zprofile b/dotfiles/.zprofile index 909323f..1dc5cfc 100644 --- a/dotfiles/.zprofile +++ b/dotfiles/.zprofile @@ -3,5 +3,5 @@ # Load Homebrew shell environment (adds bins to PATH) eval "$(/opt/homebrew/bin/brew shellenv)" -# Uncomment to add rtx shims to PATH (for VSCode and other IDEs) if needed -# export PATH="$HOME/.local/share/rtx/shims:$PATH" +# Uncomment to add mise shims to PATH (for VSCode and other IDEs) if needed +# export PATH="$HOME/.local/share/mise/shims:$PATH" diff --git a/dotfiles/.zsh_plugins.txt b/dotfiles/.zsh_plugins.txt index 4fd58e7..c31b0df 100644 --- a/dotfiles/.zsh_plugins.txt +++ b/dotfiles/.zsh_plugins.txt @@ -8,7 +8,7 @@ djui/alias-tips ohmyzsh/ohmyzsh path:lib # Oh My Zsh plugins -ohmyzsh/ohmyzsh path:plugins/rtx +ohmyzsh/ohmyzsh path:plugins/mise ohmyzsh/ohmyzsh path:plugins/git ohmyzsh/ohmyzsh path:plugins/bun ohmyzsh/ohmyzsh path:plugins/npm diff --git a/scripts/brew.sh b/scripts/brew.sh index f52ec92..8e6fd3e 100755 --- a/scripts/brew.sh +++ b/scripts/brew.sh @@ -26,8 +26,8 @@ brew install git # Development tools brew install gh brew install ack -brew install rtx brew install php +brew install mise brew install redis brew install mysql brew install awscli diff --git a/scripts/shell.sh b/scripts/shell.sh index 8cd85f6..8d9ac6f 100755 --- a/scripts/shell.sh +++ b/scripts/shell.sh @@ -11,9 +11,9 @@ for file in "$REPO_PATH"/dotfiles/.*; do fi done -# Symlink rtx and Starship configs -mkdir -p "$HOME/.config/rtx" -ln -sf "$REPO_PATH/configs/rtx/config.toml" "$HOME/.config/rtx/config.toml" +# Symlink mise and Starship configs +mkdir -p "$HOME/.config/mise" +ln -sf "$REPO_PATH/configs/mise/config.toml" "$HOME/.config/mise/config.toml" ln -sf "$REPO_PATH/configs/starship/starship.toml" "$HOME/.config/starship.toml" # Symlink Nextcloud dirs if present @@ -41,18 +41,18 @@ if [ "$SHELL" != "$(which zsh)" ]; then chsh -s "$(which zsh)" fi -# Install latest language versions with rtx +# Install latest language versions with mise if [ -z "$CI" ]; then echo "==> 📜 Installing latest Go, Node, Python and Ruby" - rtx use -g go@latest - rtx use -g node@latest - rtx use -g python@latest - rtx use -g ruby@latest + mise use -g go@latest + mise use -g node@latest + mise use -g python@latest + mise use -g ruby@latest - echo "==> ℹ️ Runtimes installed via rtx:" + echo "==> ℹ️ Runtimes installed via mise:" - rtx current + mise current fi # Notify if .extra file is missing