diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh index b415508..b241a02 100644 --- a/.zsh/aliases.zsh +++ b/.zsh/aliases.zsh @@ -1,6 +1,7 @@ alias wget='wget -c' +alias rm='rm -i' alias zshrc='source ~/.zshrc' alias dps='docker ps -a --format "table {{.Names}}\t{{.Image}}\t{{.Status}}"' alias c='docker-compose' -alias dots='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +# alias dots='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias lla='ls -lha' diff --git a/.zsh/env.zsh b/.zsh/env.zsh index 69f78d2..434297e 100644 --- a/.zsh/env.zsh +++ b/.zsh/env.zsh @@ -1,5 +1,8 @@ # Set Devs Tools # [] = {flutter, go, dotnet, npm, cargo, gem, android} export devTools="" -#Uncomment if u want this env: +# Uncomment if u want this env: # export GOPATH="" + +# Uncomment if u want this env (default: $HOME/.local/npm"): +# export NPM_CONFIG_PREFIX="" \ No newline at end of file diff --git a/.zsh/path.zsh b/.zsh/path.zsh index a4695cf..7f94cb4 100644 --- a/.zsh/path.zsh +++ b/.zsh/path.zsh @@ -1,10 +1,9 @@ -# Flutter source $OTHER/env.zsh grep -q 'flutter' <<< $devTools && export PATH="$PATH:$HOME/.development/flutter/bin" grep -q 'dotnet' <<< $devTools && export PATH="$PATH:$HOME/.dotnet" -# https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally grep -q 'cargo' <<< $devTools && source $HOME/.cargo/env grep -q 'gem' <<< $devTools && export PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" -grep -q 'npm' <<< $devTools && export PATH="$PATH:$HOME/.npm-global/bin" +# https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally +grep -q 'npm' <<< $devTools && export PATH="$PATH:$HOME/.local/npm/bin" grep -q 'go' <<< $devTools && export PATH="$PATH:$(go env GOPATH)/bin" grep -q 'android' <<< $devTools && export ANDROID_SDK_ROOT="$HOME/.android-sdk" diff --git a/bootstrap.sh b/bootstrap.sh index b0e420a..3bfc20d 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -30,6 +30,9 @@ function doIt() { if [ -n "${ANDROID_SDK_ROOT}" ]; then sed -i "s%\#export ANDROID_SDK_ROOT=\"\"%export ANDROID_SDK_ROOT=\"$ANDROID_SDK_ROOT\"%g" $HOME/.zsh/env.zsh fi + if [ -n "${NPM_CONFIG_PREFIX}" ]; then + sed -i "s%\#export NPM_CONFIG_PREFIX=\"\"%export NPM_CONFIG_PREFIX=\"$NPM_CONFIG_PREFIX\"%g" $HOME/.zsh/env.zsh + fi } if [ "$1" == "--force" -o "$1" == "-f" ]; then diff --git a/install.zsh b/install.zsh index a3df5ff..cb9812a 100755 --- a/install.zsh +++ b/install.zsh @@ -15,10 +15,13 @@ if [ -n "${devTools}" ]; then sed -i "s%export devTools=\"\"%export devTools=\"$devTools\"%g" $HOME/.zsh/env.zsh fi if [ -n "${GOPATH}" ]; then - sed -i "s%\#export GOPATH=\"\"%export GOPATH=\"$GOPATH\"%g" $HOME/.zsh/env.zsh + sed -i "s%\# export GOPATH=\"\"%export GOPATH=\"$GOPATH\"%g" $HOME/.zsh/env.zsh fi if [ -n "${ANDROID_SDK_ROOT}" ]; then - sed -i "s%\#export ANDROID_SDK_ROOT=\"\"%export ANDROID_SDK_ROOT=\"$ANDROID_SDK_ROOT\"%g" $HOME/.zsh/env.zsh + sed -i "s%\# export ANDROID_SDK_ROOT=\"\"%export ANDROID_SDK_ROOT=\"$ANDROID_SDK_ROOT\"%g" $HOME/.zsh/env.zsh +fi +if [ -n "${NPM_CONFIG_PREFIX}" ]; then + sed -i "s%\# export NPM_CONFIG_PREFIX=\"\"%export NPM_CONFIG_PREFIX=\"$NPM_CONFIG_PREFIX\"%g" $HOME/.zsh/env.zsh fi # if [ ! -d "${HOME}/.dotfiles" ]; then # git clone --bare git@github.com:mlunax/dotfiles.git $HOME/.dotfiles