Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ brew "wget"
brew "cockroachdb/tap/cockroach"
brew "mongodb/brew/mongodb-database-tools"
brew "supabase/tap/supabase"
brew "mise"
cask "codex"
9 changes: 4 additions & 5 deletions .zprofile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ fi
# Android tools
export PATH=$PATH:"$HOME/Android/Sdk/platform-tools"

# asdf completion
# https://asdf-vm.com/guide/getting-started.html
if [[ -s $HOME/.asdf/asdf.sh ]]; then
. "$HOME/.asdf/asdf.sh"
fpath=(${ASDF_DIR}/completions $fpath)
# mise (shims for non-interactive shells and IDEs)
# https://mise.jdx.dev/dev-tools/shims.html
if command -v mise &> /dev/null; then
eval "$(mise activate zsh --shims)"
fi

if [[ -f /opt/homebrew/bin/brew ]]; then
Expand Down
17 changes: 6 additions & 11 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,12 @@ fi
# Pulumi completion
[ $commands[pulumi] ] && source <(pulumi gen-completion zsh)

# JAVA_HOME (asdf)
[ -s ~/.asdf/plugins/java/set-java-home.zsh ] && . ~/.asdf/plugins/java/set-java-home.zsh

# FLUTTER_ROOT (asdf)
[[ $(asdf where flutter 2> /dev/null) ]] && export FLUTTER_ROOT="$(asdf where flutter)"

# AWS CLI completion (asdf)
[ -s $HOME/.asdf/shims/aws_completer ] && complete -C '$HOME/.asdf/shims/aws_completer' aws

# Terraform completion (asdf)
[ -s $HOME/.asdf/shims/terraform ] && complete -o nospace -C "$HOME/.asdf/shims/terraform" terraform
# mise (Linux only; Homebrew auto-activates on macOS)
# https://mise.jdx.dev/
if [[ "$(uname)" == "Linux" ]] && command -v mise &> /dev/null; then
eval "$(mise activate zsh)"
eval "$(mise completion zsh)"
fi

# Azure CLI completion
if [[ -f "$HOME/.azure/az.completion" ]] then;
Expand Down
17 changes: 0 additions & 17 deletions bootstrap/asdf.sh

This file was deleted.

2 changes: 1 addition & 1 deletion bootstrap/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ fi
task "Install prezto" "prezto.sh"
task "Install Tmux Plugin Manager" "tpm.sh"
task "Install fzf" "fzf.sh"
task "Install asdf" "asdf.sh"
task "Install rulesync" "rulesync.sh"
task "Setup mise" "mise.sh"

if [ "$(uname)" == "Linux" ]; then
task "Install Docker" "docker.sh"
Expand Down
19 changes: 19 additions & 0 deletions bootstrap/mise.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

set -e

# https://mise.jdx.dev/installing-mise.html

# Install (Linux only)
if [ "$(uname)" == "Linux" ] && ! command -v mise &> /dev/null; then
sudo install -dm 755 /etc/apt/keyrings
wget -qO - https://mise.jdx.dev/gpg-key.pub | gpg --dearmor | sudo tee /etc/apt/keyrings/mise-archive-keyring.gpg 1> /dev/null
echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=$(dpkg --print-architecture)] https://mise.jdx.dev/deb stable main" | sudo tee /etc/apt/sources.list.d/mise.list
sudo apt-get -y update
sudo apt-get -y install mise
fi

# Configure
mise settings set idiomatic_version_file_enable_tools '["node"]'

exit 0