Skip to content

Commit

Permalink
Rename rtx to mise
Browse files Browse the repository at this point in the history
  • Loading branch information
AlecRust committed Jan 5, 2024
1 parent c4db7a1 commit 712a3f9
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions dotfiles/.aliases
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions dotfiles/.gitignore_global
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions dotfiles/.huskyrc
Original file line number Diff line number Diff line change
@@ -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)"
4 changes: 2 additions & 2 deletions dotfiles/.zprofile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion dotfiles/.zsh_plugins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions scripts/shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 712a3f9

Please sign in to comment.