diff --git a/bash_exports b/bash_exports index 4e10ad6..f528a38 100644 --- a/bash_exports +++ b/bash_exports @@ -12,10 +12,10 @@ export CLICOLOR=1 export LSCOLORS=gxfxcxdxbxegedabagacad # pip should only run if there is a virtualenv currently activated -export PIP_REQUIRE_VIRTUALENV=true +#export PIP_REQUIRE_VIRTUALENV=true # cache pip-installed packages to avoid re-downloading -export PIP_DOWNLOAD_CACHE=$HOME/.pip/cache +# export PIP_DOWNLOAD_CACHE=$HOME/.pip/cache # go -export GOPATH=$HOME/.go -export GOROOT=/usr/local/opt/go/libexec \ No newline at end of file +# export GOPATH=$HOME/.go +# export GOROOT=/usr/local/opt/go/libexec \ No newline at end of file diff --git a/bash_paths b/bash_paths index 0d0f6dd..e2b9c46 100644 --- a/bash_paths +++ b/bash_paths @@ -8,10 +8,10 @@ declare -a dirs_to_prepend=( "/usr/local/bin" # Ensure that this bin always takes precedence over `/usr/bin` "$(brew --prefix node)/bin" # Add npm/yarn-installed package bin "$(brew --prefix openssl)/bin" # Add newer OpenSSL - "$GOPATH/bin" - "$GOROOT/bin" + # "$GOPATH/bin" + # "$GOROOT/bin" "$HOME/.bin" - "$HOME/.rvm/bin" + # "$HOME/.rvm/bin" ) # Directories to be appended to PATH @@ -42,7 +42,7 @@ unset dirs_to_prepend dirs_to_append export PATH # define CDPATHs which are autocompleted from when doing cd -export CDPATH=$CDPATH:~/Code:~/Projects +export CDPATH=$CDPATH:~/Code # ---------------------------------------------------------------------- diff --git a/bash_profile b/bash_profile index b67a863..c3fa20e 100644 --- a/bash_profile +++ b/bash_profile @@ -97,7 +97,7 @@ complete -C aws_completer aws # Load RVM into a shell session *as a function* # shellcheck source=/dev/null -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" +# [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # ---------------------------------------------------------------------- diff --git a/bin/install-brew.sh b/bin/install-brew.sh index fa657c7..95367f3 100755 --- a/bin/install-brew.sh +++ b/bin/install-brew.sh @@ -29,17 +29,15 @@ brew install \ node \ wget \ gpg \ + nvm \ pinentry-mac \ openssl \ tor \ - mas \ rclone \ rsync \ shellcheck \ yarn \ ipfs \ - ethereum \ - parity \ clamav # Remove outdated versions from the cellar. diff --git a/bin/install-npm.sh b/bin/install-npm.sh deleted file mode 100755 index 5abfbf6..0000000 --- a/bin/install-npm.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Installed from brewfile with node - -# install global stuff -npm install -g \ - doctoc \ - electron \ - eslint \ - fast-cli \ - gulp \ - gulp-cli \ - less \ - node-sass \ - now \ - stylus \ - serve \ - stylelint \ - xo diff --git a/bin/install.sh b/bin/install.sh index 988842e..3696108 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -54,17 +54,6 @@ echo "=============================================$(tput sgr0)" ./bin/install-brew.sh -echo "$(tput setaf 64)---------------------------------------------" -echo " ✓ done$(tput sgr0)" -# ---------------------------------------------------------------------- -# npm -# ---------------------------------------------------------------------- - -echo "$(tput setaf 136) npm all the things. " -echo "=============================================$(tput sgr0)" - -./bin/install-npm.sh - echo "$(tput setaf 64)---------------------------------------------" echo " ✓ done$(tput sgr0)" diff --git a/bin/update-everything.sh b/bin/update-everything.sh index c33ffbf..8d0ad2b 100755 --- a/bin/update-everything.sh +++ b/bin/update-everything.sh @@ -11,7 +11,7 @@ echo "------------------------------$(tput sgr0)" #sudo softwareupdate -i -a -mas upgrade +# mas upgrade # # Homebrew @@ -48,20 +48,20 @@ npm update -g # Ruby # ------------- -echo "" -echo "" -echo "$(tput setaf 3) Update rvm" -echo "------------------------------$(tput sgr0)" +# echo "" +# echo "" +# echo "$(tput setaf 3) Update rvm" +# echo "------------------------------$(tput sgr0)" -# update rvm itself -rvm get stable -rvm reload +# # update rvm itself +# rvm get stable +# rvm reload -# update all gemsets -rvm gemset update +# # update all gemsets +# rvm gemset update -# cleanup -rvm cleanup all +# # cleanup +# rvm cleanup all #