MacVim also installs regular vim

Brewfile

@@ -2,7 +2,7 @@ tap "thoughtbot/formulae"
 tap "heroku/brew"
 tap "koekeishiya/formulae"
 brew "asdf"
-brew "chunkwm"
+brew "bat"
 brew "diceware"
 brew "direnv"
 brew "fzf"
@@ -19,9 +19,9 @@ brew "rsync"
 brew "skhd"
 brew "tig"
 brew "tmux"
-brew "vim"
 brew "watch"
 brew "wget"
+brew "yabai"
 brew "zsh"
 
 cask "1password"
@@ -35,11 +35,17 @@ cask "iterm2"
 cask "kaleidoscope"
 cask "karabiner-elements"
 cask "macvim"
-cask "phantomjs"
 cask "textmate"
 
 tap "homebrew/cask-fonts"
 cask "font-source-code-pro"
 cask "font-source-sans-pro"
-cask "font-sourcecodepro-nerd-font"
+cask "font-sauce-code-pro-nerd-font"
-cask "font-sourcecodepro-nerd-font-mono"
+
+mas "1Blocker", id: 1107421413
+mas "PCalc", id: 403504866
+mas "Trello", id: 1278508951
+mas "Xcode", id: 497799835
+mas "Pastebot", id: 1179623856
+mas "Gifox", id: 1082624744
+mas "Wireguard", id: 1451685025

lib/chunkwm.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Ask the user to generate a code signing key for `chunkwm`
-echo "Please generate a code signing certificate called 'chunkwm-cert' in Keychain Access"
-read -r -p "Press any key to continue... " -n 1
-
-# We need to code sign chunkwm and skhd in order for them to be added to the
-# accessibility allowed list.
-codesign -fs "chunkwm-cert" $(which chunkwm)
-codesign -fs "chunkwm-cert" $(which skhd)
-
-# Start chunkwm
-brew services start chunkwm
-brew services start skhd

lib/mas.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# mas install 13764025890
-mas install 1107421413 # 1Blocker
-mas install 403504866  # PCalc
-mas install 1278508951 # Trello
-mas install 497799835  # Xcode
-mas install 1179623856 # Pastebot
-mas install 1082624744 # Gifox
-mas install 1451685025 # Wireguard

lib/yabai.sh

@@ -0,0 +1,3 @@
+# Start Yabai
+brew services start yabai
+brew services start skhd

setup.sh

@@ -34,10 +34,10 @@ fi
 # Install Homebrew
 step "Installing Homebrew"
 if ! type brew > /dev/null; then
-  /usr/bin/ruby -e \
+  /bin/bash -c \
-    "$(curl \
+    "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      -fsSL \
+  echo 'eval $(/opt/homebrew/bin/brew shellenv)' >> /Users/danbarber/.zprofile
-      https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  eval $(/opt/homebrew/bin/brew shellenv)
 fi
 
 # Clone setup repo
@@ -65,13 +65,9 @@ step "Changing shell to zsh"
 step "Set git author"
 "$MAC_SETUP_DIR/lib/git_author.sh"
 
-# Setup `chunkwm`
+# Setup `yabai`
-step "Setting up ChunkWM"
+step "Setting up Yabai"
-"$MAC_SETUP_DIR/lib/chunkwm.sh"
+"$MAC_SETUP_DIR/lib/yabai.sh"
-
-# Install Mac App Store apps
-step "Installing App Store apps"
-"$MAC_SETUP_DIR/lib/mas.sh"
 
 # Tweak the hell out of macOS settings
 step "Tweaking macOS config settings (takes a while)"