Brewfile

@@ -2,7 +2,7 @@ tap "thoughtbot/formulae"
 tap "heroku/brew"
 tap "koekeishiya/formulae"
 brew "asdf"
-brew "bat"
+brew "chunkwm"
 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,17 +35,11 @@ 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-sauce-code-pro-nerd-font"
-
-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
+cask "font-sourcecodepro-nerd-font"
+cask "font-sourcecodepro-nerd-font-mono"

lib/chunkwm.sh

@@ -0,0 +1,14 @@
+#!/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

@@ -0,0 +1,10 @@
+#!/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

@@ -1,3 +0,0 @@
-# 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
-  /bin/bash -c \
-    "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  echo 'eval $(/opt/homebrew/bin/brew shellenv)' >> /Users/danbarber/.zprofile
-  eval $(/opt/homebrew/bin/brew shellenv)
+  /usr/bin/ruby -e \
+    "$(curl \
+      -fsSL \
+      https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
 
 # Clone setup repo
@@ -65,9 +65,13 @@ step "Changing shell to zsh"
 step "Set git author"
 "$MAC_SETUP_DIR/lib/git_author.sh"
 
-# Setup `yabai`
-step "Setting up Yabai"
-"$MAC_SETUP_DIR/lib/yabai.sh"
+# Setup `chunkwm`
+step "Setting up ChunkWM"
+"$MAC_SETUP_DIR/lib/chunkwm.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)"