andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

Fix nvm install

Browse Source
This commit is contained in:
Andrejus
2020-09-22 18:56:10 +01:00
parent 9ac63f9bde
commit e9da16de98
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
files/.bashrc
View File

@@ -80,8 +80,7 @@ if ! shopt -oq posix; then
fi fi
export NVM_DIR="$HOME/.config/nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads 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 [ -f ~/.fzf.bash ] && source ~/.fzf.bash

4
files/.config/fish/config.fish
View File

@@ -1,8 +1,8 @@
# ---------------------------------------------------------------------------- # # ---------------------------------------------------------------------------- #
# Cross-shell (only import if environment has been setup) # Cross-shell (only import if environment has been setup)
# ---------------------------------------------------------------------------- # # ---------------------------------------------------------------------------- #
if begin; test -e ~/.profile; and type -q bass; end if begin; test -e ~/.bash_profile; and type -q bass; end
bass source ~/.profile bass source ~/.bash_profile
end end
# ---------------------------------------------------------------------------- # # ---------------------------------------------------------------------------- #

14
files/.profile
View File

@@ -5,21 +5,21 @@ if [ -z "$PROFILE_LOCK" ]; then
export PATH="$HOME/bin:$PATH" export PATH="$HOME/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"
# config # xdg data & config
if [ -z "$XDG_DATA_HOME" ]; then if [ -z "$XDG_DATA_HOME" ]; then
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="$HOME/.local/share"
mkdir -p "$XDG_DATA_HOME"
fi fi
mkdir -p "$XDG_DATA_HOME"
if [ -z "$XDG_CONFIG_HOME" ]; then if [ -z "$XDG_CONFIG_HOME" ]; then
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"
mkdir -p "$XDG_CONFIG_HOME"
fi fi
mkdir -p "$XDG_CONFIG_HOME"
# workspace # workspace
if [ -z "$WORKSPACE" ]; then if [ -z "$WORKSPACE" ]; then
export WORKSPACE="$HOME/workspace" export WORKSPACE="$HOME/workspace"
mkdir -p "$WORKSPACE"
fi fi
mkdir -p "$WORKSPACE"
# pyenv # pyenv
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
@@ -34,11 +34,15 @@ if [ -z "$PROFILE_LOCK" ]; then
export PATH="$POETRY_ROOT/bin:$PATH" export PATH="$POETRY_ROOT/bin:$PATH"
# nvm # 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" export PATH="$NVM_DIR/bin:$PATH"
# yarn # yarn
export YARN_DIR="$HOME/.yarn" export YARN_DIR="$HOME/.yarn"
mkdir -p "$YARN_DIR"
export PATH="$YARN_DIR/bin:$PATH" export PATH="$YARN_DIR/bin:$PATH"
fi fi

6
install/13-nvm.sh
View File

@@ -10,10 +10,8 @@ if not_installed "nvm"; then
run "https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh" \ run "https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh" \
"bash" "bash"
source "$NVM_DIR/nvm.sh" source "$NVM_DIR/nvm.sh"
nvm install --lts nvm alias default node
nvm install node nvm install node
nvm install iojs
nvm alias default lts/erbium
fi fi
@@ -22,5 +20,5 @@ git --git-dir="$NVM_DIR/.git" fetch -q
git --git-dir="$NVM_DIR/.git" rebase -q --autostash FETCH_HEAD git --git-dir="$NVM_DIR/.git" rebase -q --autostash FETCH_HEAD
nvm --version nvm --version
nvm use node
node --version node --version
npm --version

2
install/14-yarn.sh
View File

@@ -15,4 +15,4 @@ if not_installed "yarn"; then
fi fi
echo "yarn is installed" echo "yarn is installed"
yarn --version # yarn --version