diff --git a/Brewfile b/Brewfile index 7e30122..ed8515f 100644 --- a/Brewfile +++ b/Brewfile @@ -3,12 +3,13 @@ ############################### tap "adoptopenjdk/openjdk" -tap "aws/tap" tap "cloudflare/cloudflare" tap "dart-lang/dart" +tap "dopplerhq/cli" tap "facebook/fb" tap "github/bootstrap" tap "github/gh" +tap "hashicorp/tap" tap "heroku/brew" tap "homebrew/bundle" tap "homebrew/cask" @@ -19,6 +20,7 @@ tap "homebrew/core" tap "homebrew/services" tap "homebrew/test-bot" tap "sass/sass" +tap "superfly/tap" tap "teamookla/speedtest" tap "thoughtbot/formulae" tap "twilio/brew" @@ -97,7 +99,6 @@ brew "nvm" # Mostly ordinary binaries brew "act" -brew "aws/tap/aws-sam-cli" brew "aws-shell" brew "awscli" brew "angular-cli" @@ -118,12 +119,17 @@ brew "deno" brew "dive" brew "docker-credential-helper-ecr" brew "doctl" +brew "dopplerhq/cli/doppler" brew "elixir" brew "erlang" brew "fx" brew "geoip" brew "go" brew "guetzli" +brew "hashicorp/tap/packer" +brew "hashicorp/tap/terraform" +brew "hashicorp/tap/vault" +brew "hashicorp/tap/waypoint" brew "heroku/brew/heroku" brew "heroku/brew/heroku-node" brew "htop" @@ -173,8 +179,8 @@ brew "serverless" brew "shellcheck" brew "sqlite" brew "sub2srt" +brew "superfly/tap/flyctl" brew "teamookla/speedtest/speedtest" -brew "terraform" brew "thoughtbot/formulae/parity" brew "tor" brew "torsocks" diff --git a/npm/install_globals.sh b/npm/install_globals.sh index 0d263ff..0a2fe58 100755 --- a/npm/install_globals.sh +++ b/npm/install_globals.sh @@ -15,15 +15,19 @@ packages=( gatsby-cli gitmoji-cli gulp + is-up-cli json-server netlify-cli newman nodemon npm-check + npm-check-updates pm2 postcss-cli postcss prettier + release-it + serve standard stylelint superstatic diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 2cf8ddf..e8c8165 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -86,12 +86,14 @@ make_hugo() { # parentheses lets us cd to Hugo path without changing our current location ( cd "$GOPATH/src/github.com/gohugoio/hugo" \ + && /bin/bash -c "$GOPATH/bin/hugo env" \ && git checkout master \ && mage uninstall \ && git pull origin master \ && git reset --hard HEAD \ && mage -v hugo \ - && HUGO_BUILD_TAGS=extended mage -v install + && HUGO_BUILD_TAGS=extended mage -v install \ + && /bin/bash -c "$GOPATH/bin/hugo env" ) } alias hugo_brew="brew upgrade hugo --fetch-HEAD --build-from-source" diff --git a/zsh/macos.zsh b/zsh/macos.zsh index 68bae70..f84dddf 100644 --- a/zsh/macos.zsh +++ b/zsh/macos.zsh @@ -45,8 +45,8 @@ update() { brew cleanup echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}" - npm install npm@latest --global - npm update --global + npm install --global npm@latest npm-check-updates@latest + npm-check-updates --global --upgrade yarn global upgrade echo -e "${YELLOW}Updating Ruby gems...${NC}" diff --git a/zsh/path.zsh b/zsh/path.zsh index 4c88cd4..f72e8b9 100644 --- a/zsh/path.zsh +++ b/zsh/path.zsh @@ -53,12 +53,11 @@ export PATH="$HOMEBREW_PREFIX/opt/jpeg-turbo/bin:$PATH" #export LDFLAGS="-L$HOMEBREW_PREFIX/opt/jpeg-turbo/lib" #export CPPFLAGS="-I$HOMEBREW_PREFIX/opt/jpeg-turbo/include" -# nvm -# export NVM_DIR="$HOME/.nvm" -# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - # pyenv +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" if command -v pyenv 1>/dev/null 2>&1; then + eval "$(pyenv init --path)" eval "$(pyenv init -)" fi