From d7ed15f294b9509366b2cfd9966d5f0605b357ec Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Fri, 1 Aug 2025 13:38:22 +0200 Subject: [PATCH] feat(asdf): remove asdf and update mise --- asdfrc | 1 - bashrc | 10 ---------- config/fish/config.fish | 15 --------------- config/mise/mise.toml | 7 +++++-- homebrew/mac-mini | 8 ++++---- homebrew/macbook-2019 | 2 -- homebrew/macbook-2023 | 2 -- install.conf.yaml | 2 -- private | 2 +- session-variables.sh | 3 --- setup.sh | 4 ---- tool-versions | 9 --------- zshrc | 14 -------------- 13 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 asdfrc delete mode 100644 tool-versions diff --git a/asdfrc b/asdfrc deleted file mode 100644 index e600bd0..0000000 --- a/asdfrc +++ /dev/null @@ -1 +0,0 @@ -legacy_version_file = yes diff --git a/bashrc b/bashrc index ebd7b28..b655e7e 100644 --- a/bashrc +++ b/bashrc @@ -20,16 +20,6 @@ bind "set show-all-if-ambiguous on" # *** *** Tools *** *** -# asdf -if command -v brew >/dev/null 2>&1 && [ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]; then - source "$(brew --prefix asdf)/libexec/asdf.sh" -fi - -# Mise -if command -v mise >/dev/null 2>&1; then - eval "$($HOME/.local/bin/mise activate bash)" -fi - # GitHub CLI completion if command -v gh >/dev/null 2>&1; then eval "$(gh completion -s bash)" diff --git a/config/fish/config.fish b/config/fish/config.fish index aef5f55..44135cb 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -93,13 +93,6 @@ set -x VOLTA_HOME $HOME/.volta # *** *** Session Paths *** *** -# asdf -set -l asdf_path (brew --prefix asdf) -if test -f $asdf_path/libexec/asdf.fish - source $asdf_path/libexec/asdf.fish - set -x PATH $HOME/.asdf/shims $PATH -end - # Volta set -x PATH $PATH $VOLTA_HOME/bin @@ -127,9 +120,6 @@ set -x PATH $PATH /usr/local/sbin # Emacs set -x PATH $PATH $HOME/.config/emacs/bin -# Make sure asdf comes first -set -x PATH $HOME/.asdf/shims $PATH - # Stable Diffusion Webui # set VIRTUAL_ENV $HOME/Code/AI/stable-diffusion-webui/venv @@ -140,11 +130,6 @@ if command -v gh >/dev/null 2>&1 eval "$(gh completion -s fish)" end -# Mise -if command -v mise >/dev/null 2>&1 - $HOME/.local/bin/mise activate fish | source -end - # fzf fzf --fish | source diff --git a/config/mise/mise.toml b/config/mise/mise.toml index e40a412..060a1c0 100644 --- a/config/mise/mise.toml +++ b/config/mise/mise.toml @@ -1,4 +1,5 @@ [tools] +bun = "latest" deno = "2.0.0" direnv = "2.32.2" go = "1.22.5" @@ -7,7 +8,9 @@ neovim = "0.11.1" node = "22.15.1" python = "3.10.9" ruby = "3.4.2" -rust = "1.86.0" +rust = "1.88.0" +usage = "latest" [settings] -idiomatic_version_file_enable_tools = ["ruby"] +idiomatic_version_file_enable_tools = ["ruby", "node"] +not_found_auto_install = true diff --git a/homebrew/mac-mini b/homebrew/mac-mini index 027bfd6..bd9e56e 100644 --- a/homebrew/mac-mini +++ b/homebrew/mac-mini @@ -24,12 +24,10 @@ brew "openssl@3" brew "ruby" # Text processor and publishing toolchain for AsciiDoc brew "asciidoctor" -# GNU internationalization (i18n) and localization (l10n) library -brew "gettext" -# Extendable version manager with support for Ruby, Node.js, Erlang & more -brew "asdf" # Improved shell history for zsh, bash, fish and nushell brew "atuin", restart_service: :changed +# GNU internationalization (i18n) and localization (l10n) library +brew "gettext" # Library for command-line editing brew "readline" # Programmable completion for Bash 3.2 @@ -218,6 +216,8 @@ brew "mactop" brew "mas" # Fast and user friendly build system brew "meson" +# Polyglot runtime manager (asdf rust clone) +brew "mise" # CLI tool for saving complete web pages as a single HTML file brew "monolith" # Feature-rich command-line audio/video downloader diff --git a/homebrew/macbook-2019 b/homebrew/macbook-2019 index d9069c8..cef3a17 100644 --- a/homebrew/macbook-2019 +++ b/homebrew/macbook-2019 @@ -16,8 +16,6 @@ brew "asciidoctor" # GNU internationalization (i18n) and localization (l10n) library brew "gettext" # Extendable version manager with support for Ruby, Node.js, Erlang & more -brew "asdf" -# Improved shell history for zsh, bash, fish and nushell brew "atuin" # Programmable completion for Bash 3.2 brew "bash-completion" diff --git a/homebrew/macbook-2023 b/homebrew/macbook-2023 index d7130e0..5c5de48 100644 --- a/homebrew/macbook-2023 +++ b/homebrew/macbook-2023 @@ -20,8 +20,6 @@ brew "ruby" brew "asciidoctor" # GNU internationalization (i18n) and localization (l10n) library brew "gettext" -# Extendable version manager with support for Ruby, Node.js, Erlang & more -brew "asdf" # Improved shell history for zsh, bash, fish and nushell brew "atuin" # Library for command-line editing diff --git a/install.conf.yaml b/install.conf.yaml index fc681ba..bddf82f 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -18,7 +18,6 @@ ~/.ack: ack ~/.ag: ag ~/.aliases: aliases - ~/.asdfrc: asdfrc ~/.bash_profile: bash_profile ~/.bashrc: bashrc ~/.ctags: ctags @@ -36,7 +35,6 @@ ~/.markdownlint.yaml: markdownlint.yaml ~/.profile: profile ~/.session-variables.sh: session-variables.sh - ~/.tool-versions: tool-versions ~/.wakatime.cfg: private/wakatime.cfg ~/.wget: wget ~/.zsh_plugins.txt: zsh_plugins.txt diff --git a/private b/private index 2d70cad..dc051e7 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 2d70cadb8ae8332bdab8389b035fe24ca65fed1f +Subproject commit dc051e7672c4a369e5861474753205179a1e2f12 diff --git a/session-variables.sh b/session-variables.sh index f44c3ac..cabaa53 100644 --- a/session-variables.sh +++ b/session-variables.sh @@ -69,6 +69,3 @@ fi export PATH="/usr/bin:$PATH" export PATH="/usr/local/bin:$PATH" export PATH="/usr/local/sbin:$PATH" - -# asdf -export PATH="$HOME/.asdf/shims:$PATH" diff --git a/setup.sh b/setup.sh index de6d31d..7058aae 100755 --- a/setup.sh +++ b/setup.sh @@ -128,10 +128,6 @@ gpg-agent --daemon curl https://mise.run | sh ./private/mise/init.sh -# Install asdf versions -./private/asdf/init.sh -asdf reshim - # Install Doom Emacs git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.config/emacs ~/.config/emacs/bin/doom install diff --git a/tool-versions b/tool-versions deleted file mode 100644 index 41a8c70..0000000 --- a/tool-versions +++ /dev/null @@ -1,9 +0,0 @@ -deno 2.0.0 -python 3.10.9 -lua 5.4.6 -rust 1.86.0 -ruby 3.3.4 -golang 1.22.5 -nodejs 22.15.1 -neovim 0.11.1 -direnv 2.32.2 diff --git a/zshrc b/zshrc index e79f142..f53875f 100644 --- a/zshrc +++ b/zshrc @@ -15,20 +15,6 @@ bindkey -M viins '^z' fzf-cd-widget # (z) jump # *** *** Tools *** *** -# asdf -if command -v brew &>/dev/null && [ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]; then - . "$(brew --prefix asdf)/libexec/asdf.sh" - - if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" ]; then - source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" - fi -fi - -# Mise -if command -v mise &>/dev/null; then - eval "$($HOME/.local/bin/mise activate zsh)" -fi - # GitHub CLI completion if command -v gh &>/dev/null; then eval "$(gh completion -s zsh)"