From ac70d282d2efd67ad079f9120b52d9141a522263 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Sat, 22 Jul 2023 23:02:02 +0100
Subject: [PATCH] bash: add asdf

---
 bashrc.d/asdf.bash |  4 ++++
 install            | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 bashrc.d/asdf.bash

diff --git a/bashrc.d/asdf.bash b/bashrc.d/asdf.bash
new file mode 100644
index 0000000..063e4eb
--- /dev/null
+++ b/bashrc.d/asdf.bash
@@ -0,0 +1,4 @@
+if [ -d "$HOME/.asdf" ] ; then
+  . "$HOME/.asdf/asdf.sh"
+  . "$HOME/.asdf/completions/asdf.bash"
+fi
diff --git a/install b/install
index b859cc2..c6d1bd6 100755
--- a/install
+++ b/install
@@ -65,7 +65,6 @@ else
 fi
 
 mkdir -p ~/src/
-install_rust_app https://github.com/sharkdp/fd.git ~/src/fd fd
 
 # git-prompt
 # if [ ! -e ~/.git-prompt.sh ]; then
@@ -90,18 +89,16 @@ if [ "$(uname -s)" == 'Darwin' ]; then
   brew install \
     fd ag wget git bat tmux bash-completion \
     vim macvim jq
-
-  # brew tap universal-ctags/universal-ctags
-  # brew install --HEAD universal-ctags
+else
+  install_rust_app https://github.com/sharkdp/fd.git ~/src/fd fd
 fi
 
 git config --global user.email "paul@blacksun.org.uk"
 git config --global user.name "Paul Walker"
 
-git config --global core.pager "delta --line-numbers --dark"
-git config --global delta.side-by-side true
-git config --global delta.syntax-theme Dracula
-# git config --global delta.syntax-theme "Solarized (dark)"
+if [ ! -d "$HOME/.asdf" ] ; then
+  git clone https://github.com/asdf-vm/asdf.git ~/.asdf
+fi
 
 if [ ! -d ~/.tmux/plugins/tpm ] ; then
   git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
@@ -112,14 +109,14 @@ if [ ! -d ~/.tmux/plugins/tpm ] ; then
 fi
 
 # Install nvm.
-(curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash) || exit 1
+(curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash) || exit 1
 
 source ./bashrc.d/nvm.bash
 
 # We can't stop nvm appending to bashrc, but we don't need it - the variables nvm writes to .bashrc are already in
 # ~/.bashrc.d/nvm.bash
 cp bashrc bashrc-bk
-nvm install node && nvm use node && npm i -g yarn
+nvm install node && nvm use node && corepack enable
 cp bashrc-bk bashrc
 
-./install-vim
+# ./install-vim