Early March 2021 updates

Brewfile

@@ -7,11 +7,12 @@ brew "aws-cdk"
 brew "awscli"
 brew "bat"
 brew "cookiecutter"
+brew "curl"
 brew "exa"
 brew "ffmpeg"
 brew "gcc"
+brew "gh"
 brew "git"
-brew "go"
 brew "hadolint"
 brew "heroku"
 brew "highlight"
@@ -20,21 +21,22 @@ brew "httpie"
 brew "hugo"
 brew "jq"
 brew "mitmproxy"
+brew "netlify-cli"
 brew "p7zip"
-brew "pre-commit"
+brew "pipx"
+brew "pyenv"
 brew "rgbds"
 brew "ruby"
 brew "sdl2"
 brew "shellcheck"
-brew "terraform"
+brew "tfenv"
+brew "trash"
 brew "vim"
 brew "wget"
 brew "youtube-dl"
 brew "zsh-syntax-highlighting"
 
-cask "backblaze"
 cask "caffeine"
-cask "db-browser-for-sqlite"
 cask "docker"
 cask "dropbox"
 cask "firefox"
@@ -43,10 +45,8 @@ cask "imageoptim"
 cask "insomnia"
 cask "iterm2"
 cask "itsycal"
-cask "mongodb-compass"
 cask "ngrok"
 cask "notion"
-cask "postman"
 cask "qlcolorcode"
 cask "qlmarkdown"
 cask "qlstephen"
@@ -55,11 +55,6 @@ cask "quicklook-json"
 cask "sameboy"
 cask "sketch"
 cask "slack"
-cask "spotify"
 cask "tableplus"
-cask "visual-studio-code"
 cask "vlc"
 
-mas "Keynote", id: 409183694
-mas "Numbers", id: 409203825
-mas "Things", id: 904280696

home/.aliases

@@ -11,14 +11,22 @@ export BAT_THEME="TwoDark"
 # tldr replaces man
 alias help='tldr'
 
+# trash replaces rm
+alias rm='trash'
+
+# git shortcuts
+alias gb="git branch"
+alias gc="git commit -m"
+alias gco="git checkout"
+alias gp="git pull --ff-only"
+
 # Etc.
 alias fixgestures="killall Dock"
 alias dj="python manage.py"
 alias killmigrations="find . -path \"*/migrations/*.py\" -not -name \"__init__.py\" -delete"
 alias github="cd ~/code/github/"
 
 # gbdev
-alias gb="cd ~/code/gb_dev/"
 alias bgb="wine /Applications/bgb/bgb.exe"
 alias gbmap="wine ~/code/gb_dev/gbmb/GBMB.EXE"
 alias gbtile="wine ~/code/gb_dev/gbtd/GBTD.EXE"
@@ -36,11 +44,10 @@ alias flushdns="dscacheutil -flushcache && sudo killall -HUP mDNSResponder"
 # BrainHi
 alias up="docker-compose up --build --detach"
 alias down="docker-compose down -v"
-alias makemigrations="docker-compose run web python manage.py makemigrations"
-alias migrate="docker-compose run web python manage.py migrate"
+alias makemigrations="docker-compose run web python manage.py makemigrations --lint"
 alias testea="docker-compose run -e DJANGO_CONFIGURATION=Testing web pytest --reuse-db"
 alias cubreme="docker-compose run -e DJANGO_CONFIGURATION=Testing web pytest --reuse-db --cov=cosmos"
 alias run="docker-compose run web python manage.py"
-alias logs="docker-compose logs -f web"
-alias shellme="docker-compose run web python manage.py shell_plus"
-alias cosmosredis="docker-compose run redis redis-cli -h redis"
+alias logs="docker-compose logs -f web worker"
+alias shell="docker-compose run web python manage.py shell_plus"
+alias bh-connect="sshuttle --dns -r"

home/.gitconfig

@@ -7,3 +7,7 @@
 
 [credential]
 	helper = osxkeychain
+[pull]
+	ff = only
+[init]
+	defaultBranch = main

home/.zshrc

@@ -120,6 +120,11 @@ export HOMEBREW_INSTALL_CLEANUP=1
 
 # Python
 export PYTHONDONTWRITEBYTECODE=true
+export PYCURL_SSL_LIBRARY=openssl
+export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib"
+export CPPFLAGS="-I/usr/local/opt/openssl@1.1/include"
+export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig"
+export PATH="/usr/local/opt/openssl@1.1/bin:$PATH"
 
 # gbdev
 export PATH="~/code/gb_dev/gbdk-n/bin:$PATH"
@@ -129,7 +134,6 @@ export PATH="~/code/gb_dev/sdcc/bin:$PATH"
 # NVM
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-[[ -r "$NVM_DIR/bash_completion" ]] && . "$NVM_DIR/bash_completion"
 
 # pyenv
 if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
@@ -141,4 +145,3 @@ source "$HOME/.aliases"
 fpath+=$HOME/.zsh/pure
 autoload -U promptinit; promptinit
 prompt pure
-

install.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 echo "==> Running install.sh..."
 
 echo "==> Installing Homebrew..."
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
 echo "==> Updating Hombrew..."
 brew update
@@ -32,14 +32,16 @@ brew install pyenv
 
 # Install Python
 echo "==> Installing Python versions via pyenv..."
-pyenv install 2.7.17
-pyenv install 3.8.2
-pyenv global 3.8.2
+pyenv install 2.7.18
+pyenv install 3.7.10
+pyenv install 3.8.8
+pyenv install 3.9.2
+pyenv global 3.8.8
 
 # Global Pip stuff
 echo "==> Installing Python packages..."
 pip3 install -U pip
-pip3 install -U virtualenv black pipenv
+pip3 install -U virtualenv black pipenv pre-commit
 
 
 # Poetry
@@ -60,7 +62,8 @@ echo "==> Installing ohmyzsh and pure theme..."
 sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
 # Move the original .zsh back where it belongs
-mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc
+cd ~
+mv .zshrc.pre-oh-my-zsh .zshrc
 
 # Install pure prompt
 mkdir -p "$HOME/.zsh"