Mercurial > dotfiles

changeset 687:6aabd0b8d766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
feat: install asdf directly without brew
author zegervdv <zegervdv@me.com>
date Sun, 02 Oct 2022 18:43:18 +0200
parents e486254ef420
children 6e98364a5a28
files .chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl .chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl dot_Brewfile dot_zshrc
diffstat 4 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl	Sun Oct 02 18:22:00 2022 +0200
+++ b/.chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl	Sun Oct 02 18:43:18 2022 +0200
@@ -1,7 +1,7 @@
 {{ if (or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin")) -}}
 #!/usr/bin/env zsh
 
-source $(brew --prefix asdf)/libexec/asdf.sh
+source $HOME/.asdf/asdf.sh
 asdf shell rust 1.64.0
 brew unlink sqlite
 
--- a/.chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl	Sun Oct 02 18:22:00 2022 +0200
+++ b/.chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl	Sun Oct 02 18:43:18 2022 +0200
@@ -3,6 +3,20 @@
 
 # asdf globals tools hash: {{ include "dot_tool-versions" | sha256sum }}
 
+ASDF_INSTALL="$HOME/.asdf"
+ASDF_VERSION="v0.10.2"
+
+if [[ -d "$ASDF_INSTALL" ]]
+then
+  cd "$ASDF_INSTALL"
+  git pull
+  git checkout "$ASDF_VERSION"
+else
+  git clone https://github.com/asdf-vm/asdf.git "$ASDF_INSTALL" --branch="$ASDF_VERSION"
+fi
+
+source ${ASDF_INSTALL}/asdf.sh
+
 asdf_plugin_add() {
   if ! asdf plugin-list | grep -Fq "$1"
   then
@@ -15,6 +29,7 @@
 asdf_plugin_add python
 asdf_plugin_add neovim
 asdf_plugin_add direnv
+asdf_plugin_add rust
 asdf_plugin_add sqlite
 
 asdf install
--- a/dot_Brewfile	Sun Oct 02 18:22:00 2022 +0200
+++ b/dot_Brewfile	Sun Oct 02 18:43:18 2022 +0200
@@ -24,5 +24,4 @@
 brew "git"
 brew "zegervdv/tools/cbfmt"
 brew "pass"
-brew "asdf"
 brew "zsh"
--- a/dot_zshrc	Sun Oct 02 18:22:00 2022 +0200
+++ b/dot_zshrc	Sun Oct 02 18:43:18 2022 +0200
@@ -249,11 +249,8 @@
 
 [ -f ~/.zshrc.local ] && source ~/.zshrc.local
 
-# Must run after brew is loaded
-if command -v brew &> /dev/null
-then
-  source $(brew --prefix asdf)/libexec/asdf.sh
-fi
+source $HOME/.asdf/asdf.sh
+fpath=(${ASDF_DIR}/completions $fpath)
 
 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" ]
 then