move stuff around to make just dotfiles work on linux

2025-09-15 23:15:30 -04:00 · 2020-05-13 11:19:39 -04:00
parent bc2ee5ceec
commit 53ff9d8ecb
11 changed files with 131 additions and 412 deletions
--- a/40
+++ b/40
@@ -2,11 +2,15 @@
 #  Taps                       #
 ###############################

+tap "appveyor/brew"
 tap "aws/tap"
 tap "caskroom/cask"
 tap "cloudflare/cloudflare"
+tap "dart-lang/dart"
 # tap "exolnet/deprecated"
 tap "facebook/fb"
+tap "github/bootstrap"
+tap "github/gh"
 tap "goreleaser/tap"
 tap "heroku/brew"
 tap "hhvm/hhvm"
@@ -18,11 +22,12 @@ tap "homebrew/services"
 tap "homebrew/test-bot"
 tap "jakejarvis/brew", "git@github.com:jakejarvis/homebrew-brew.git"
 tap "mongodb/brew"
+tap "sass/sass"
+tap "teamookla/speedtest"
 tap "thoughtbot/formulae"
 tap "twilio/brew"
 tap "wpengine/wpe-cli"

-
 ###############################
 #  Binaries                   #
 ###############################
@@ -69,7 +74,7 @@ brew "pigz"
 brew "pv"
 brew "rename"
 brew "rlwrap"
-brew "ssh-copy-id"
+brew "ssh-copy-id", link: true
 brew "tree"
 brew "vbindiff"
 brew "zopfli"
@@ -79,10 +84,12 @@ brew "the_silver_searcher"
 brew "git"
 brew "git-lfs"
 brew "git-crypt"
+brew "hub"
+brew "github/gh/gh"

 # Node & NPM / NVM
 brew "node"
-# brew "nvm"
+brew "nvm"

 # Mostly ordinary binaries
 brew "amazon-ecs-cli"
@@ -108,18 +115,19 @@ brew "gitlab-runner"
 brew "go"
 brew "goreleaser/tap/goreleaser"
 brew "govendor"
-brew "heroku"
-brew "heroku-node"
+brew "guetzli"
+brew "heroku/brew/heroku-node"
+brew "heroku/brew/heroku"
 brew "hhvm"
 brew "htop"
 brew "httpie"
 brew "httrack"
-brew "hub"
 brew "hydra"
 brew "iproute2mac"
 brew "jq"
 brew "kubernetes-cli"
 brew "kubernetes-helm"
+brew "libsass", args: ["HEAD"]
 brew "mcrypt"
 brew "mhash"
 brew "mkcert"
@@ -152,12 +160,16 @@ brew "ruby-build"
 brew "rbenv"
 brew "rclone"
 brew "s3fs"
+brew "sass/sass/migrator"
+brew "sass/sass/sass"
 brew "serverless"
 brew "shellcheck"
 brew "speedtest-cli"
 brew "sqlite"
 brew "sub2srt"
+brew "teamookla/speedtest/speedtest"
 brew "terraform"
+brew "thoughtbot/formulae/parity"
 brew "tor"
 brew "torsocks"
 brew "travis"
@@ -213,7 +225,6 @@ brew "hashcat"
 brew "nikto"
 brew "tcpdump"

-
 ###############################
 #  macOS Apps via Cask        #
 ###############################
@@ -244,6 +255,7 @@ cask "vnc-viewer"
 # Passwords, VPNs, other Security
 cask "1password"
 cask "authy"
+cask "expressvpn"
 # cask "gpg-suite-no-mail"     # Install Mail separately: https://github.com/GpgMailNoActivation/GpgMailNoActivation
 cask "jakejarvis/brew/gpg-suite-no-drm"      # personal cask to install GPG suite and mail.app plugin without activation
 cask "keybase"
@@ -258,17 +270,20 @@ cask "eclipse-java"
 cask "filezilla"
 cask "github"
 cask "glyphs"
+cask "google-cloud-sdk"
 cask "imageoptim"
 cask "intellij-idea"
 cask "iterm2"
 cask "java8"
+cask "multipass"
+cask "ngrok"
 cask "postman"
 cask "powershell"
 cask "robo-3t"
 cask "sequel-pro"
+cask "tower"
 cask "transmit"
-# install insiders build instead: https://code.visualstudio.com/insiders/
-# cask "visual-studio-code"
+cask "visual-studio-code"
 cask "visual-studio"
 cask "xquartz"

@@ -296,6 +311,7 @@ cask "whatsapp"
 cask "zoomus"

 # Gaming
+cask "shadow"
 cask "steam"
 cask "nvidia-geforce-now"

@@ -306,10 +322,6 @@ cask "metasploit"
 cask "wifi-explorer"
 cask "wireshark"

-# QuickLook Extensions
-# cask "qlstephen"
-# cask "qlvideo"
-
 # Browsers (for reference only -- install these via offline DMGs no matter what)
 # * Firefox
 #    - Stable
@@ -321,7 +333,6 @@ cask "wireshark"
 # * Safari
 #    - Preview: https://developer.apple.com/safari/technology-preview/

-
 ###############################
 #  macOS Apps via App Store   #
 ###############################
@@ -344,7 +355,6 @@ mas "Xcode", id: 497799835
 mas "Amphetamine", id: 937984704
 mas "Disk Speed Test", id: 425264550
 mas "Microsoft Remote Desktop", id: 1295203466
-mas "Microsoft Remote Desktop", id: 715768417
 mas "Outline", id: 1356178125
 mas "Shazam", id: 897118787
 mas "TweetDeck", id: 485812721
--- a/install.sh
+++ b/install.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "👋  Deep breaths, everything will (probably) be fine!"
+
+# Set up symbolic links for ZSH and Git pointing to this cloned repo
+ln -s $HOME/.dotfiles/zsh/.zshrc $HOME/.zshrc
+ln -s $HOME/.dotfiles/git/.gitconfig $HOME/.gitconfig
+ln -s $HOME/.dotfiles/git/.gitignore_global $HOME/.gitignore_global
+
+# Get Oh My ZSH up and running
+if [ ! -e ~/.oh-my-zsh ]; then
+  sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+fi
+
+# Make ZSH the default shell environment (maybe unnecessary on Catalina?)
+chsh -s $(which zsh)
+
+if [ "$(uname)" == "Darwin" ]; then
+  # shellcheck disable=SC1091
+  source ./macos/macos.sh
+else
+  echo ""
+  echo "This isn't a Mac, so we're all done here!"
+  echo "Logout/restart now for the full effects."
+  exit 0
+fi
--- a/macos/brew-cask.sh
+++ b/macos/brew-cask.sh
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-
-#############################################################
-###     Try using the Brewfile one folder up instead!     ###
-###        brew tap homebrew/bundle && brew bundle        ###
-#############################################################
-
-
-# I'm not a huge fan of using Casks, but keeping a list here in case I change 
-# my mind when I'm staring at a default macOS install and freaking out...
-
-# To update all:
-#   brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup
-
-
-# System Utilities
-
-brew cask install osxfuse
-brew cask install appzapper
-brew cask install backblaze
-brew cask install backblaze-downloader
-brew cask install carbon-copy-cloner
-brew cask install cleanmymac
-brew cask install coconutbattery
-brew cask install daisydisk
-brew cask install duet
-brew cask install endurance
-brew cask install etrecheckpro
-brew cask install filebot
-brew cask install geekbench
-brew cask install intel-power-gadget
-brew cask install paragon-ntfs
-brew cask install the-unarchiver
-brew cask install transmission
-brew cask install unetbootin
-brew cask install vnc-viewer
-
-
-# Passwords, VPNs, other Security
-
-brew cask install 1password
-brew cask install authy
-# brew cask install gpg-suite-no-mail     # Install separately: https://github.com/GpgMailNoActivation/GpgMailNoActivation
-brew tap jakejarvis/brew && brew install jakejarvis/brew/gpg-suite-no-drm
-brew cask install keybase
-brew cask install little-snitch
-brew cask install nordvpn
-brew cask install tor-browser
-brew cask install tunnelblick
-
-
-# Development
-
-brew cask install eclipse-java
-brew cask install filezilla
-brew cask install github
-brew cask install glyphs
-brew cask install imageoptim
-brew cask install intellij-idea
-brew cask install iterm2
-brew cask install postman
-brew cask install robo-3t
-brew cask install sequel-pro
-brew cask install transmit
-brew cask install visual-studio-code
-brew cask install visual-studio
-
-
-# Virtual Machines (& Docker)
-
-brew cask install docker
-brew cask install virtualbox
-brew cask install virtualbox-extension-pack
-brew cask install vagrant
-brew cask install vmware-fusion
-
-
-# Media
-
-brew cask install beamer
-brew cask install handbrake
-brew cask install iina
-brew cask install plex-media-player
-brew cask install pocket-casts
-brew cask install spotify
-brew cask install vlc
-
-
-# Communication/Social
-
-brew cask install discord
-brew cask install skype
-brew cask install slack
-brew cask install whatsapp
-brew cask install zoomus
-
-
-# Gaming
-
-brew cask install steam
-brew cask install nvidia-geforce-now
-
-
-# Pentesting
-
-brew cask install burp-suite
-brew cask install charles
-brew cask install wifi-explorer
-brew cask install wireshark
-
-
-# Browsers (for reference only -- install these via offline DMGs no matter what)
-
-# * Firefox
-#    - Stable
-#    - Dev: https://www.mozilla.org/en-US/firefox/developer/
-#    - Nightly: https://www.mozilla.org/en-US/firefox/channel/desktop/
-
-# * Chrome
-#    - Stable
-#    - Canary: https://www.google.com/chrome/canary/
-
-# * Safari
-#    - Preview: https://developer.apple.com/safari/technology-preview/
--- a/macos/brew.sh
+++ b/macos/brew.sh
@@ -1,227 +0,0 @@
-#!/usr/bin/env bash
-
-
-#############################################################
-###     Try using the Brewfile one folder up instead!     ###
-###        brew tap homebrew/bundle && brew bundle        ###
-#############################################################
-
-
-# WARNING: I have not tested this yet (nor needed to, thankfully) so this is
-# basically just a list of everything I've installed with Homebrew. :)
-
-
-# Make sure we're using the latest Homebrew.
-brew update
-
-# Upgrade any already-installed formulae.
-brew upgrade
-
-# Tap casks. (Just for Android SDK here, otherwise not a fan of using casks!)
-brew tap caskroom/cask
-
-# Save Homebrew's installed location.
-BREW_PREFIX=$(brew --prefix)
-
-
-# Perhaps most importantly...
-brew install zsh
-
-# Better bash as a backup.
-brew install bash
-brew install bash-completion
-
-# Install GNU core utilities (those that come with macOS are outdated).
-# Don't forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
-brew install coreutils
-# ln -s "${BREW_PREFIX}/bin/gsha256sum" "${BREW_PREFIX}/bin/sha256sum"
-
-# Install some other useful utilities like `sponge`.
-brew install moreutils
-# Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
-brew install findutils
-# Install GNU `sed`, overwriting the built-in `sed`.
-brew install gnu-sed   # --with-default-names
-
-# Install `wget` with IRI support.
-brew install wget   # --with-iri
-
-# Install GnuPG to enable PGP-signing commits.
-brew install gnupg
-
-# Install more recent versions of some macOS tools.
-brew install vim   # --with-override-system-vi
-brew install grep
-brew install openssh
-brew install screen
-brew install gmp
-
-# Install other universally useful binaries.
-brew install ack
-#brew install exiv2
-brew install gs
-brew install imagemagick   # --with-webp
-brew install ffmpeg   # --with-libvpx
-brew install lua
-brew install lynx
-brew install p7zip
-brew install pigz
-brew install pv
-brew install rename
-brew install rlwrap
-brew install ssh-copy-id
-brew install tree
-brew install vbindiff
-brew install zopfli
-brew install the_silver_searcher
-
-# Git
-brew install git
-brew install git-lfs
-brew install git-crypt
-
-# Node & NPM / NVM
-brew install node
-# brew install nvm
-
-# mtr (better ping & traceroute)
-brew install mtr
-# Allow mtr to run without sudo
-mtrlocation=$(brew info mtr | grep Cellar | sed -e 's/ (.*//') #  e.g. `/Users/jake/.homebrew/Cellar/mtr/0.86`
-sudo chmod 4755 $mtrlocation/sbin/mtr
-sudo chown root $mtrlocation/sbin/mtr
-
-
-# ---------- My Fringe Needs ----------
-
-brew install amazon-ecs-cli
-brew tap aws/tap && brew install aws-sam-cli
-brew install aws-shell
-brew install angular-cli
-brew install asciinema
-brew install azure-cli
-brew install caddy
-brew install carthage
-brew install cli53
-brew install cloudflare/cloudflare/cloudflared
-brew install cocoapods
-brew install composer
-brew install dnsmasq
-brew install doctl
-brew install elixir
-brew install erlang
-brew tap facebook/fb && brew install fbsimctl
-brew install geoip
-brew install gitlab-runner
-brew install go
-brew install govendor
-brew tap heroku/brew && brew install heroku
-brew install heroku-node
-brew tap hhvm/hhvm && brew install hhvm
-brew install htop
-brew install httrack
-brew install hub
-brew install hugo
-brew install hydra
-brew install iproute2mac
-brew install jq
-brew install kubernetes-cli
-brew install kubernetes-helm
-brew install mcrypt
-brew install mhash
-brew install mkcert
-# brew install mongodb
-brew tap mongodb/brew && brew install mongodb-community
-brew install mosh
-brew install mysql
-brew install mysql-client
-brew install ncurses
-brew install neofetch
-brew install netcat
-brew install openvpn
-brew install optipng
-brew install packer
-brew tap thoughtbot/formulae && brew install parity
-brew install php        # = php@7.3   https://formulae.brew.sh/formula/php
-brew install php@7.1
-brew install php@7.2
-# brew tap exolnet/homebrew-deprecated && brew install php@5.6
-# brew tap exolnet/homebrew-deprecated && brew install php@7.0
-brew install pngcheck
-brew install pngcrush
-brew install postgresql
-brew install python
-brew install python@2
-brew install qt
-brew install ruby
-brew install ruby-build
-brew install rbenv
-brew install rclone
-brew install s3fs
-brew install serverless
-brew install speedtest-cli
-brew install sqlite
-brew install sub2srt
-brew install terraform
-brew install the_silver_searcher
-brew install tidy-html5
-brew install tor
-brew install torsocks
-brew install travis
-brew install typescript
-brew install unrar
-brew install watchman
-brew install whois
-brew install wireguard-tools
-brew install wireguard-go
-brew install wp-cli
-brew tap wpengine/wpe-cli && brew install wpe-cli
-brew install xz
-brew install yarn
-brew install youtube-dl
-brew install yuicompressor
-
-# Android SDK
-brew install ant
-brew install maven
-brew install gradle
-brew cask install android-sdk
-
-# Pentesting tools
-brew install aircrack-ng
-brew install bfg
-brew install binutils
-brew install binwalk
-brew install cifer
-brew install dex2jar
-brew install dns2tcp
-brew install fcrackzip
-brew install foremost
-brew install hashpump
-brew install hydra
-brew install john
-brew install knock
-brew install netpbm
-brew install nmap
-brew install pdfcrack
-brew install pngcheck
-brew install socat
-brew install sqlmap
-brew install tcpflow
-brew install tcpreplay
-brew install tcptrace
-brew install xpdf
-brew install bettercap
-brew install hashcat
-brew install nikto
-brew install tcpdump
-
-# -------------------------------------
-
-
-
-# Remove outdated versions from the cellar.
-brew cleanup
-
-# Call the doctor after this mess just to be safe.
-brew doctor
--- a/macos/defaults.sh
+++ b/macos/defaults.sh
@@ -6,6 +6,7 @@
 #    https://github.com/paulirish/dotfiles/blob/master/.osx
 #    https://github.com/kevinSuttle/macOS-Defaults/blob/master/.macos

+set -e

 COMPUTER_NAME="JJ-MBP15"

--- a/macos/macos.sh
+++ b/macos/macos.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash

+set -e
+
 if test ! "$(uname)" = "Darwin"; then
  exit 0
 fi

-echo "👋  Deep breaths, everything will (probably) be fine!"
-
 # Make sure macOS is fully up to date before doing anything
 sudo softwareupdate --install --all

@@ -27,19 +27,7 @@ sudo xcode-select --install
 # Accept Xcode license
 sudo xcodebuild -license accept

-# Get Oh My ZSH up and running
-if [ ! -e ~/.oh-my-zsh ]; then
-  sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-fi
-
-# Make ZSH the default shell environment (maybe unnecessary on Catalina?)
-chsh -s $(which zsh)
-
-# Set up symbolic links for ZSH and Git pointing to this cloned repo
-ln -s $HOME/.dotfiles/zsh/.zshrc $HOME/.zshrc
-ln -s $HOME/.dotfiles/git/.gitconfig $HOME/.gitconfig
-ln -s $HOME/.dotfiles/git/.gitignore_global $HOME/.gitignore_global
-
 # Set macOS defaults
 # Needs to be last since this will restart everything when done
+# shellcheck disable=SC1091
 source ./macos/defaults.sh
--- a/vscode/extensions.json
+++ b/vscode/extensions.json
@@ -47,7 +47,7 @@
    },
    "name": "cpptools",
    "publisher": "ms-vscode",
-    "version": "0.27.1"
+    "version": "0.28.0"
  },
  {
    "metadata": {
@@ -69,6 +69,16 @@
    "publisher": "EditorConfig",
    "version": "0.14.5"
  },
+  {
+    "metadata": {
+      "id": "7328a705-91fc-49e6-8293-da6f112e482d",
+      "publisherId": "GitHub.github-vscode-theme",
+      "publisherDisplayName": "GitHub"
+    },
+    "name": "github-vscode-theme",
+    "publisher": "GitHub",
+    "version": "1.0.0"
+  },
  {
    "metadata": {
      "id": "d6f6cfea-4b6f-41f4-b571-6ad2ab7918da",
@@ -99,6 +109,16 @@
    "publisher": "PKief",
    "version": "4.1.0"
  },
+  {
+    "metadata": {
+      "id": "96fa4707-6983-4489-b7c5-d5ffdfdcce90",
+      "publisherId": "esbenp.prettier-vscode",
+      "publisherDisplayName": "esbenp"
+    },
+    "name": "prettier-vscode",
+    "publisher": "esbenp",
+    "version": "4.6.0"
+  },
  {
    "metadata": {
      "id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5",
@@ -107,7 +127,7 @@
    },
    "name": "python",
    "publisher": "ms-python",
-    "version": "2020.4.76186"
+    "version": "2020.5.78807"
  },
  {
    "metadata": {
@@ -167,7 +187,7 @@
    },
    "name": "vscode-docker",
    "publisher": "ms-azuretools",
-    "version": "1.1.0"
+    "version": "1.2.0"
  },
  {
    "metadata": {
@@ -179,6 +199,16 @@
    "publisher": "mrmlnc",
    "version": "1.2.1"
  },
+  {
+    "metadata": {
+      "id": "583b2b34-2c1e-4634-8c0b-0b82e283ea3a",
+      "publisherId": "dbaeumer.vscode-eslint",
+      "publisherDisplayName": "dbaeumer"
+    },
+    "name": "vscode-eslint",
+    "publisher": "dbaeumer",
+    "version": "2.1.5"
+  },
  {
    "metadata": {
      "id": "c5f4d87f-a524-462c-ac01-923eb19cf3e9",
@@ -189,6 +219,16 @@
    "publisher": "firefox-devtools",
    "version": "2.8.0"
  },
+  {
+    "metadata": {
+      "id": "9ccc1dd7-7ec4-4a46-bd4f-7d7b8b9d322a",
+      "publisherId": "vscode-icons-team.vscode-icons",
+      "publisherDisplayName": "vscode-icons-team"
+    },
+    "name": "vscode-icons",
+    "publisher": "vscode-icons-team",
+    "version": "10.1.1"
+  },
  {
    "metadata": {
      "id": "69ddd764-339a-4ecc-97c1-9c4ece58e36d",
--- a/vscode/keybindingsMac.json
+++ b/vscode/keybindingsMac.json
@@ -1,6 +1,5 @@
 // Place your key bindings in this file to overwrite the defaults
 [
-
-{ "key": "ctrl+tab",              "command": "workbench.action.nextEditor" },
-{ "key": "ctrl+shift+tab",        "command": "workbench.action.previousEditor" }
+    { "key": "ctrl+tab",              "command": "workbench.action.nextEditor" },
+    { "key": "ctrl+shift+tab",        "command": "workbench.action.previousEditor" }
 ]
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -1,7 +1,7 @@
 // Place your settings in this file to overwrite the default settings
 {
    "editor.fontFamily": "Source Code Pro, Menlo, Monaco, 'Courier New', monospace",
-    "editor.fontSize": 14.5,
+    "editor.fontSize": 14,
    "editor.cursorStyle": "line",
    "sync.gist": "80a04530e0142ff5b7b77c92d5c6f526",
    "sync.autoDownload": false,
@@ -25,22 +25,15 @@
    "terminal.external.osxExec": "iTerm.app",
    "telemetry.enableCrashReporter": false,
    "telemetry.enableTelemetry": false,
-    "html.format.indentInnerHtml": true,
    "html.format.endWithNewline": true,
    "css.lint.important": "warning",
    "css.lint.unknownVendorSpecificProperties": "warning",
    "css.lint.zeroUnits": "warning",
    "git.enableCommitSigning": true,
    "git.showPushSuccessNotification": true,
-    "workbench.iconTheme": "material-icon-theme",
+    "workbench.iconTheme": "vscode-icons",
    "liveshare.featureSet": "insiders",
    "aws.profile": "profile:default",
-    "githubPullRequests.remotes": [
-        "origin",
-        "upstream",
-        "github",
-        "hosted"
-    ],
    "sync.forceUpload": true,
    "editor.renderWhitespace": "none",
    "editor.suggestSelection": "first",
@@ -53,9 +46,7 @@
    "go.buildOnSave": "off",
    "go.vetOnSave": "off",
    "php.validate.run": "onType",
-    "material-icon-theme.activeIconPack": "",
-    "material-icon-theme.saturation": null,
-    "workbench.colorTheme": "Slime",
+    "workbench.colorTheme": "GitHub Dark",
    "aws.samcli.location": "/usr/local/bin/sam",
    "git.autofetch": true,
    "editor.acceptSuggestionOnEnter": "off",
@@ -80,5 +71,21 @@
        }
    ],
    "terminal.integrated.cursorStyle": "line",
-    "terminal.integrated.cursorBlinking": true
+    "terminal.integrated.cursorBlinking": true,
+    "prettier.requireConfig": true,
+    "eslint.alwaysShowStatus": true,
+    "aws.telemetry": false,
+    "git.allowForcePush": true,
+    "git.defaultCloneDirectory": "~/source",
+    "git.fetchOnPull": true,
+    "git.suggestSmartCommit": false,
+    "githubPullRequests.defaultMergeMethod": "rebase",
+    "material-icon-theme.activeIconPack": "none",
+    "material-icon-theme.showReloadMessage": false,
+    "material-icon-theme.showWelcomeMessage": false,
+    "prettier.configPath": ".prettierrc",
+    "dotfiles.repository": "https://github.com/jakejarvis/dotfiles.git",
+    "scss.lint.duplicateProperties": "warning",
+    "scss.lint.compatibleVendorPrefixes": "warning",
+    "scss.lint.zeroUnits": "warning"
 }
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -58,8 +58,6 @@ alias vs="code ./"
 # `brew install hub`
 alias git="hub"
 alias g="hub"
-alias github="hub browse"
-alias gist="hub gist create --open"

 alias gc="git commit -m"  # + commit message
 alias gca="git add . && git commit -m"  # + commit message
@@ -79,9 +77,10 @@ alias gsub="git submodule update --recursive --remote"
 alias gundo="git reset --soft HEAD~1"
 alias greset="git reset"
 alias gsync="hub sync"
-alias ghnew="hub create --browse"
-alias ghfork="hub fork --remote-name=origin"
-alias ghpr="hub pull-request --push --edit --browse"
+alias github="hub browse"
+alias gist="hub gist create --open"
+alias ghnew="gh repo create"
+alias ghfork="gh repo fork"
 alias ghci="hub ci-status --verbose"

 alias dc="docker-compose"
--- a/zsh/path.zsh
+++ b/zsh/path.zsh
@@ -35,15 +35,14 @@ if command -v pyenv 1>/dev/null 2>&1; then
 fi

 # rbenv
-eval "$(rbenv init -)"
+if command -v rbenv 1>/dev/null 2>&1; then
+  eval "$(rbenv init -)"
+fi

 # ----- Third-party additions below: -----

-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/Users/jake/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/jake/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/Users/jake/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/jake/google-cloud-sdk/completion.zsh.inc'; fi
+# Google Cloud SDK
+[ -f /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc

 # added by travis gem
 [ -f /Users/jake/.travis/travis.sh ] && source /Users/jake/.travis/travis.sh