From e9da16de98886fc16a5232e0dc20b3e21f630825 Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Tue, 22 Sep 2020 18:56:10 +0100
Subject: [PATCH] Fix nvm install

---
 files/.bashrc                  |  3 +--
 files/.config/fish/config.fish |  4 ++--
 files/.profile                 | 14 +++++++++-----
 install/13-nvm.sh              |  6 ++----
 install/14-yarn.sh             |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/files/.bashrc b/files/.bashrc
index c0a28f0..3c6bb3b 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -80,8 +80,7 @@ if ! shopt -oq posix; then
 fi
 
 
-export NVM_DIR="$HOME/.config/nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/files/.config/fish/config.fish b/files/.config/fish/config.fish
index 7b6440e..19f0446 100644
--- a/files/.config/fish/config.fish
+++ b/files/.config/fish/config.fish
@@ -1,8 +1,8 @@
 # ---------------------------------------------------------------------------- #
 #   Cross-shell (only import if environment has been setup)
 # ---------------------------------------------------------------------------- #
-if begin; test -e ~/.profile; and type -q bass; end
-	bass source ~/.profile
+if begin; test -e ~/.bash_profile; and type -q bass; end
+	bass source ~/.bash_profile
 end
 
 # ---------------------------------------------------------------------------- #
diff --git a/files/.profile b/files/.profile
index 0d31118..227452a 100644
--- a/files/.profile
+++ b/files/.profile
@@ -5,21 +5,21 @@ if [ -z "$PROFILE_LOCK" ]; then
     export PATH="$HOME/bin:$PATH"
     export PATH="$HOME/.local/bin:$PATH"
 
-    # config
+    # xdg data & config
     if [ -z "$XDG_DATA_HOME" ]; then
         export XDG_DATA_HOME="$HOME/.local/share"
-        mkdir -p "$XDG_DATA_HOME"
     fi
+    mkdir -p "$XDG_DATA_HOME"
     if [ -z "$XDG_CONFIG_HOME" ]; then
         export XDG_CONFIG_HOME="$HOME/.config"
-        mkdir -p "$XDG_CONFIG_HOME"
     fi
+    mkdir -p "$XDG_CONFIG_HOME"
 
     # workspace
     if [ -z "$WORKSPACE" ]; then
         export WORKSPACE="$HOME/workspace"
-        mkdir -p "$WORKSPACE"
     fi
+    mkdir -p "$WORKSPACE"
 
     # pyenv
     export PYENV_ROOT="$HOME/.pyenv"
@@ -34,11 +34,15 @@ if [ -z "$PROFILE_LOCK" ]; then
     export PATH="$POETRY_ROOT/bin:$PATH"
 
     # nvm
-    export NVM_DIR="$XDG_CONFIG_HOME/nvm"
+    if [ -z "$NVM_DIR" ]; then
+   	export NVM_DIR="$HOME/.nvm"
+    fi
+    mkdir -p "$NVM_DIR"
     export PATH="$NVM_DIR/bin:$PATH"
 
     # yarn
     export YARN_DIR="$HOME/.yarn"
+    mkdir -p "$YARN_DIR"
     export PATH="$YARN_DIR/bin:$PATH"
 
 fi
diff --git a/install/13-nvm.sh b/install/13-nvm.sh
index e1cefa3..1d05117 100755
--- a/install/13-nvm.sh
+++ b/install/13-nvm.sh
@@ -10,10 +10,8 @@ if not_installed "nvm"; then
     run "https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh" \
         "bash"
     source "$NVM_DIR/nvm.sh"
-    nvm install --lts
+    nvm alias default node
     nvm install node
-    nvm install iojs
-    nvm alias default lts/erbium
 
 fi
 
@@ -22,5 +20,5 @@ git --git-dir="$NVM_DIR/.git" fetch -q
 git --git-dir="$NVM_DIR/.git" rebase -q --autostash FETCH_HEAD
 
 nvm --version
+nvm use node
 node --version
-npm --version
diff --git a/install/14-yarn.sh b/install/14-yarn.sh
index 03d8a5c..650f090 100755
--- a/install/14-yarn.sh
+++ b/install/14-yarn.sh
@@ -15,4 +15,4 @@ if not_installed "yarn"; then
 fi
 
 echo "yarn is installed"
-yarn --version
+# yarn --version