Brewfile

@@ -1,6 +1,5 @@
 tap "thoughtbot/formulae"
 tap "heroku/brew"
-tap "koekeishiya/formulae"
 brew "asdf"
 brew "chunkwm"
 brew "diceware"
@@ -29,14 +28,13 @@ cask "firefox"
 cask "google-chrome"
 cask "imagealpha"
 cask "imageoptim"
-cask "iterm2"
+cask "iterm2-nightly"
 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"

extra.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
-
 MAC_SETUP_DIR="$HOME/mac-setup"
 
 BOLD="\033[1m"

lib/chunkwm.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/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"

lib/dotfiles.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
-
 cd "$HOME"
 
 if [ $SHELL != $(which zsh) ]; then

lib/macos.sh

@@ -606,6 +606,7 @@ for app in "Activity Monitor" \
   "Photos" \
   "Safari" \
   "SystemUIServer" \
+  "Terminal" \
   "iCal"; do
   killall "${app}" &> /dev/null
 done

lib/mas.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 # mas install 13764025890
 mas install 1107421413

lib/tools.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 export LDFLAGS="-L/usr/local/opt/zlib/lib"
 export CPPFLAGS="-I/usr/local/opt/zlib/include"

setup.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
-
 MAC_SETUP_DIR="$HOME/mac-setup"
 
 BOLD="\033[1m"
@@ -50,14 +49,6 @@ fi
 step "Installing Homebrew bundle"
 brew bundle --file="$MAC_SETUP_DIR/Brewfile"
 
-# Install dotfiles
-step "Installing dotfiles"
-"$MAC_SETUP_DIR/lib/dotfiles.sh"
-
-# Setup git author
-step "Set git author"
-"$MAC_SETUP_DIR/lib/git_author.sh"
-
 # Setup `chunkwm`
 step "Setting up ChunkWM"
 "$MAC_SETUP_DIR/lib/chunkwm.sh"
@@ -66,6 +57,14 @@ step "Setting up ChunkWM"
 step "Installing App Store apps"
 "$MAC_SETUP_DIR/lib/mas.sh"
 
+# Install dotfiles
+step "Installing dotfiles"
+"$MAC_SETUP_DIR/lib/dotfiles.sh"
+
+# Setup git author
+step "Set git author"
+"$MAC_SETUP_DIR/lib/git_author.sh"
+
 # Tweak the hell out of macOS settings
 step "Tweaking macOS config settings (takes a while)"
 "$MAC_SETUP_DIR/lib/macos.sh"