Add more stuff to asdf

install

@@ -86,15 +86,13 @@ if [ "$(uname -s)" == 'Darwin' ]; then
   [ -z "$(which brew)" ] &&
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-  brew install \
-    fd ag wget git bat tmux bash-completion \
-    vim macvim jq 
-else
-  install_rust_app https://github.com/sharkdp/fd.git ~/src/fd fd
+  brew install wget bash-completion macvim isync
 fi
 
 git config --global user.email "paul@blacksun.org.uk"
 git config --global user.name "Paul Walker"
+git config --global pull.rebase true
+git config --global push.default current
 
 if [ ! -d "$HOME/.rbenv" ] ; then
   git clone https://github.com/rbenv/rbenv.git "$HOME/.rbenv"
@@ -106,15 +104,29 @@ if [ ! -d "$HOME/.asdf" ] ; then
 fi
 
 # Add and install these ones.
-for plugin in golang erlang elixir clojure ripgrep sbcl ; do
+ADD_AND_INSTALL="golang erlang elixir clojure ripgrep ag fd bat jq nodejs fzf"
+if [ "$(uname -s)" == 'Darwin' ]; then
+  echo "Detected macOS, installing extra packages via asdf."
+  ADD_AND_INSTALL="$ADD_AND_INSTALL git tmux vim"
+fi
+
+for plugin in $ADD_AND_INSTALL ; do
   asdf plugin add $plugin && \
     asdf install $plugin latest && \
     asdf global $plugin latest
 done
+unset ADD_AND_INSTALL
 
 # Just add these, for now.
-asdf plugin add python
-asdf plugin add gohugo
+ADD_ONLY="python tmux sbcl ocaml gohugo"
+for plugin in $ADD_ONLY ; do 
+  asdf plugin add $plugin
+done
+unset ADD_ONLY
+
+# if [ "$(uname -s)" == 'Darwin' ]; then
+#   CPATH=$(brew --prefix)/include:$CPATH LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH asdf install sbcl latest
+# fi
 
 if [ ! -d ~/.tmux/plugins/tpm ] ; then
   git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
@@ -124,15 +136,18 @@ if [ ! -d ~/.tmux/plugins/tpm ] ; then
   fi
 fi
 
-# Install nvm.
-(curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash) || exit 1
+if [ ! -d "$HOME/.nvm" ] ; then
+  # Install nvm.
+  # (curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.4/install.sh | bash) || exit 1
+  git clone https://github.com/nvm-sh/nvm.git ~/.nvm/
+fi
 
 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
+cp bashrc bashrc-bk.nvm
 nvm install node && nvm use node && corepack enable
-cp bashrc-bk bashrc
+cp bashrc-bk.nvm bashrc
 
 # ./install-vim