From 3e7a2a643e367d9e8c7c184558827c66b916b00b Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 21 Apr 2023 09:09:23 -0700
Subject: [PATCH 01/53] bump fig line

---
 zsh/zshrc.symlink | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 36fa863cc97..8b034a3020b 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,5 +1,5 @@
 # Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # shortcut to this dotfiles path is $ZSH
 export ZSH=$HOME/.dotfiles
 
@@ -52,4 +52,4 @@ bindkey "^[[A" up-line-or-beginning-search # Up
 bindkey "^[[B" down-line-or-beginning-search # Down
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

From fbe175f38cb0fc795853aa34429d76f4ab884b41 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 20:51:30 -0800
Subject: [PATCH 02/53] rm fig

---
 zsh/zshrc.symlink | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 8b034a3020b..baa385f2b2c 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,5 +1,3 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # shortcut to this dotfiles path is $ZSH
 export ZSH=$HOME/.dotfiles
 
@@ -51,5 +49,4 @@ zle -N down-line-or-beginning-search
 bindkey "^[[A" up-line-or-beginning-search # Up
 bindkey "^[[B" down-line-or-beginning-search # Down
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+eval "$(github-copilot-cli alias -- "$0")"

From 0c6ab2f4c4c21a48e0a22f02dc733f1a7fd69e99 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 20:53:18 -0800
Subject: [PATCH 03/53] no need for node (that's right i said it)

---
 node/install.sh | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100755 node/install.sh

diff --git a/node/install.sh b/node/install.sh
deleted file mode 100755
index 03c92217043..00000000000
--- a/node/install.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if test ! $(which spoof)
-then
-  if test $(which npm)
-  then
-    sudo npm install spoof -g
-  fi
-fi

From 8926eca023f48514cd4b9dd2805cccb8bb6ee4d2 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:02:02 -0800
Subject: [PATCH 04/53] update plist format

---
 macos/set-defaults.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/macos/set-defaults.sh b/macos/set-defaults.sh
index 03d6f2d9dbe..017c6e56070 100755
--- a/macos/set-defaults.sh
+++ b/macos/set-defaults.sh
@@ -31,11 +31,11 @@ defaults write com.apple.dock wvous-bl-corner -int 5
 defaults write com.apple.dock wvous-bl-modifier -int 0
 
 # Hide Safari's bookmark bar.
-defaults write com.apple.Safari ShowFavoritesBar -bool false
+defaults write com.apple.Safari.plist ShowFavoritesBar -bool false
 
 # Set up Safari for development.
-defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
-defaults write com.apple.Safari IncludeDevelopMenu -bool true
-defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
-defaults write com.apple.Safari "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true
+defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true
+defaults write com.apple.Safari.plist IncludeDevelopMenu -bool true
+defaults write com.apple.Safari.plist WebKitDeveloperExtrasEnabledPreferenceKey -bool true
+defaults write com.apple.Safari.plist "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true
 defaults write NSGlobalDomain WebKitDeveloperExtras -bool true

From 064b365df1a299ed3943cbbacb27a17e1e337d52 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:03:05 -0800
Subject: [PATCH 05/53] opt for faster dot

---
 macos/install.sh | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100755 macos/install.sh

diff --git a/macos/install.sh b/macos/install.sh
deleted file mode 100755
index 312f8eb6ca9..00000000000
--- a/macos/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if test ! "$(uname)" = "Darwin"
-  then
-  exit 0
-fi
-
-# The Brewfile handles Homebrew-based app and library installs, but there may
-# still be updates and installables in the Mac App Store. There's a nifty
-# command line interface to it that we can use to just install everything, so
-# yeah, let's do that.
-
-echo "› sudo softwareupdate -i -a"
-sudo softwareupdate -i -a

From 763d54e588dd6f7319aa7f907168ff3606ceff8f Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:09:41 -0800
Subject: [PATCH 06/53] hey let's use the brewfile again

---
 Brewfile       | 13 +++++++++++++
 script/install |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 Brewfile

diff --git a/Brewfile b/Brewfile
new file mode 100644
index 00000000000..93ec75a830b
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,13 @@
+cask_args appdir: '/Applications'
+
+tap 'homebrew/bundle'
+
+brew 'imagemagick'
+brew 'spaceman-diff'
+brew 'spark'
+brew 'wget'
+brew 'yt-dlp'
+
+cask '1password'
+cask 'handbrake'
+cask 'vlc'
diff --git a/script/install b/script/install
index 1887fc2ca49..826f87e8dd0 100755
--- a/script/install
+++ b/script/install
@@ -6,5 +6,8 @@ set -e
 
 cd "$(dirname $0)"/..
 
+echo "› brew bundle"
+brew bundle
+
 # find the installers and run them iteratively
 find . -name install.sh | while read installer ; do sh -c "${installer}" ; done

From b2c58fe58aa32fdf86a1c10abd23a44100e2bb26 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:14:39 -0800
Subject: [PATCH 07/53] ignore brewfile lock

---
 .gitignore | 1 +
 Brewfile   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1b67d59d7d7..bbb3a495c22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 git/gitconfig.local.symlink
+Brewfile.lock.json
diff --git a/Brewfile b/Brewfile
index 93ec75a830b..95bc6e8bb00 100644
--- a/Brewfile
+++ b/Brewfile
@@ -8,6 +8,5 @@ brew 'spark'
 brew 'wget'
 brew 'yt-dlp'
 
-cask '1password'
 cask 'handbrake'
 cask 'vlc'

From 241576a4f677cde57cd43e625725997dd2aa7212 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:16:08 -0800
Subject: [PATCH 08/53] everyone loves raycast

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 95bc6e8bb00..a55c07885be 100644
--- a/Brewfile
+++ b/Brewfile
@@ -9,4 +9,5 @@ brew 'wget'
 brew 'yt-dlp'
 
 cask 'handbrake'
+cask 'raycast'
 cask 'vlc'

From af11dbf56f74eef64d418d54e99442bba94b083d Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:16:49 -0800
Subject: [PATCH 09/53] lil less verbose

---
 bin/dot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/dot b/bin/dot
index 605b0591ec5..54c8a3494b1 100755
--- a/bin/dot
+++ b/bin/dot
@@ -51,5 +51,5 @@ echo "› brew update"
 brew update
 
 # Install software
-echo "› $ZSH/script/install"
+echo "› script/install"
 $ZSH/script/install

From 11c95ae39fc7cdae3f04c97eb46a0274dc96840c Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:18:12 -0800
Subject: [PATCH 10/53] remove some older commands

rip old github
---
 bin/atom-package-install | 13 ---------
 bin/movieme              | 30 --------------------
 bin/mustacheme           | 56 -------------------------------------
 bin/res                  | 60 ----------------------------------------
 bin/time-report          | 21 --------------
 5 files changed, 180 deletions(-)
 delete mode 100755 bin/atom-package-install
 delete mode 100755 bin/movieme
 delete mode 100755 bin/mustacheme
 delete mode 100755 bin/res
 delete mode 100755 bin/time-report

diff --git a/bin/atom-package-install b/bin/atom-package-install
deleted file mode 100755
index 218bf414ee1..00000000000
--- a/bin/atom-package-install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Usage: atom-package-install
-#
-# Installs the atom packages listed in your packages.txt file
-# located at ~/.dotfiles/atom.symlink/packages.txt
-#
-# You can generate a new list based on currently installed
-# packages via atom-package-backup
-
-set -e
-
-apm install --packages-file ~/.dotfiles/atom.symlink/packages.txt
diff --git a/bin/movieme b/bin/movieme
deleted file mode 100755
index 115a364f0fa..00000000000
--- a/bin/movieme
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# MOVIE ME as in: "MOVIE ME AN ANIMATED GIF FROM THIS MOVIE, DAMMIT"
-#
-# Creates an animated gif from a movie file. Uploads to CloudApp. You must also
-# have `gifme` and `cloudapp` in your $PATH.
-#
-#   $1 - the path to the movie we're converting.
-#   $2 - the start time of the finished product.
-#        This can be in seconds, or it also accepts the "hh:mm:ss[.xxx]" format.
-#   $3 - the duration of the video sequence.
-#        This can be in seconds, or it also accepts the "hh:mm:ss[.xxx]" format.
-#
-# Examples:
-#
-#   movieme <path> <start-time> <duration>
-#   ~/Desktop/dr-strangelove.mp4 23:12 3
-#   ~/Desktop/holman-backflip-on-fire.mov 3.9 1.75
-
-# cleanup
-rm -rf /tmp/movieme
-
-# create tmp dir
-mkdir -p /tmp/movieme
-
-# split the movie into constituent frames
-ffmpeg -i "$1" -f image2 -vf "scale=iw*sar:ih" -ss $2 -t $3 -r 7 /tmp/movieme/d-%05d.png
-
-# ANIMATE
-gifme /tmp/movieme/* -d 0
diff --git a/bin/mustacheme b/bin/mustacheme
deleted file mode 100755
index ad28a39f6e2..00000000000
--- a/bin/mustacheme
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# mustacheme 
-#   expanded from an idea from Rick Olson (@technoweenie)
-#
-# Takes a .gif, splits it into constituent frames, mustaches each, restitches
-# the gif, and uploads to cloudapp.
-#
-# This leverages the nifty service mustachify.me, which will analyze your photo,
-# identify faces, and add a mustache to your image.
-#
-# If the .gif is a remote file, we'll download it and blow it up locally.
-#
-#   $1 - the path of the gif
-#
-# Examples:
-#
-#   mustacheme holman-jumping-off-cliff-into-butter.gif
-#   mustacheme http://github.com/holman/butter/blob/master/holman-butter.gif
-#
-# Dependencies:
-#
-#   - ImageMagick. If you're on a Mac, run:
-#       brew install imagemagick
-#   - wget
-#   - cloudapp: https://github.com/holman/dotfiles/blob/master/bin/cloudapp
-#   - gifme:    https://github.com/holman/gifme
-
-set -e
-
-# Set up mustacheme temporary working directory
-output=/tmp/mustacheme
-rm -rf $output
-mkdir $output
-
-if [[ $1 == http* ]]
-then
-  wget $1 -O /tmp/mustache-download.gif
-  file=/tmp/mustache-download.gif
-else
-  file="$1"
-fi
-
-# Blow apart the GIF
-convert $1 -coalesce $output/frame_%03d.gif
-
-# Mustache each frame
-for frame in $output/*.gif
-do
-  url=$(cloudapp $frame | grep Uploaded | awk '{print substr($0, index($0, "http://"))}')
-  url="$url/$(basename $frame)"
-  wget "http://mustachify.me/?src=$url" -O "$frame-stache"
-done
-
-# Ding! Fries are done.
-gifme $output/*-stache -d 0
diff --git a/bin/res b/bin/res
deleted file mode 100755
index 40afcfdf55e..00000000000
--- a/bin/res
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/osascript
-#
-# A small command line script to change screen resolutions on Mountain Lion.
-#
-# Primarily I switch between two resolutions on my Retina MacBook Pro: Retina,
-# and the full resolution setting. This means for particular apps I use, I can
-# quickly jump between seeing more pixels and less.
-#
-# There doesn't appear to be an easy way to do this without just using
-# AppleScript to automate clicking buttons, so that's what this does.
-#
-# Most of this script is adapted from this helpful answer:
-#
-#   http://apple.stackexchange.com/a/91590
-#
-# Make sure "Enable access for assistive devices" is checked in the
-# Accessibility section of System Properties.
-
-local index1, index2
-
-set index1 to 3 -- 1440 x 900 (Best for Retina)
-set index2 to 5 -- 1920 x 1200 (More Space)
-
-tell application "System Preferences"
-	reveal anchor "displaysDisplayTab" of pane "com.apple.preference.displays"
-end tell
-
-local indexToUse
-
-tell application "System Events" to tell process "System Preferences" to tell window "Built-in Retina Display"
-
-	click radio button "Display" of tab group 1
-	click radio button "Scaled" of radio group 1 of tab group 1
-
-	-- Click the "Scaled" radio button
-	click radio button "Scaled" of radio group 1 of tab group 1
-
-	tell tab group 1
-		tell radio group 1 of group 1
-			-- Depending on what scale option/index is current selected, set the appropriate new option/index to use
-			if (value of radio button index1) is true then
-				set indexToUse to index2
-			else if (value of radio button index2) is true then
-				set indexToUse to index1
-			end if
-
-			-- Click the radio button for the new scale option/index
-			click radio button indexToUse
-		end tell
-	end tell
-
-	-- If option/index 1 is selected a warning prompt is displayed, click the OK button to dismiss the prompt
-	if indexToUse = 1 then
-		click button "OK" of sheet 1
-	end if
-end tell
-
-tell application "System Preferences"
-	quit
-end tell
diff --git a/bin/time-report b/bin/time-report
deleted file mode 100755
index f9d31e06ffd..00000000000
--- a/bin/time-report
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/zsh
-#
-# time-report [from] [to]
-#
-# A quick script to pull a report from `watson`
-# (https://github.com/TailorDev/Watson) and dump it out to my desktop.
-#
-# Example:
-#
-#   time-report 2022-08-15 2022-08-31
-
-set -e
-
-start=$1
-end=$2
-
-file=$HOME/Desktop/"$1 to $2.txt"
-log=$(watson log --from $1 --to $2)
-total=$(watson report --from $1 --to $2 | tail -1)
-
-(echo $total; echo ""; echo $log) > "${file}"
\ No newline at end of file

From 05d45821dea1e9aa79d1839f22ee877d9eda33bc Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 11 Jan 2024 21:34:32 -0800
Subject: [PATCH 11/53] install some neat other friends

---
 Brewfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Brewfile b/Brewfile
index a55c07885be..26c7b766d1e 100644
--- a/Brewfile
+++ b/Brewfile
@@ -8,6 +8,13 @@ brew 'spark'
 brew 'wget'
 brew 'yt-dlp'
 
+cask 'airtable'
+cask 'arq'
+cask 'cron'
 cask 'handbrake'
+cask 'plex'
 cask 'raycast'
+cask 'warp'
+cask 'visual-studio-code'
 cask 'vlc'
+cask 'zed'

From 0b34e5dd0b40581eaa4e96648642ee3d07e793e1 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 12 Jan 2024 17:03:07 -0800
Subject: [PATCH 12/53] stripe cli

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 26c7b766d1e..82832eea5f7 100644
--- a/Brewfile
+++ b/Brewfile
@@ -5,6 +5,7 @@ tap 'homebrew/bundle'
 brew 'imagemagick'
 brew 'spaceman-diff'
 brew 'spark'
+brew 'stripe/stripe-cli/stripe'
 brew 'wget'
 brew 'yt-dlp'
 

From 734402e1864b48a5fb1b0c71463a195720d1c961 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 19 Jan 2024 22:11:59 -0800
Subject: [PATCH 13/53] rip cron

---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 82832eea5f7..a058c722916 100644
--- a/Brewfile
+++ b/Brewfile
@@ -11,8 +11,8 @@ brew 'yt-dlp'
 
 cask 'airtable'
 cask 'arq'
-cask 'cron'
 cask 'handbrake'
+cask 'notion-calendar'
 cask 'plex'
 cask 'raycast'
 cask 'warp'

From 93b20c1394206594ffb44e9ea3dfbc1be7c5a4ce Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 19 Jan 2024 22:15:04 -0800
Subject: [PATCH 14/53] sonos

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index a058c722916..e7dd8ae110c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -14,6 +14,7 @@ cask 'arq'
 cask 'handbrake'
 cask 'notion-calendar'
 cask 'plex'
+cask 'sonos'
 cask 'raycast'
 cask 'warp'
 cask 'visual-studio-code'

From c355291a4c5c8e156137168eba0783ef58dbc501 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 26 Jan 2024 21:09:59 -0800
Subject: [PATCH 15/53] cloudapp is long-dead

---
 bin/cloudapp | 62 ----------------------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100755 bin/cloudapp

diff --git a/bin/cloudapp b/bin/cloudapp
deleted file mode 100755
index 1ec555ab660..00000000000
--- a/bin/cloudapp
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-#
-# cloudapp
-# Zach Holman / @holman
-#
-# Uploads a file from the command line to CloudApp, drops it into your 
-# clipboard (on a Mac, at least).
-#
-# Example:
-#
-#   cloudapp drunk-blake.png
-#
-# This requires Aaron Russell's cloudapp_api gem:
-#
-#   gem install cloudapp_api
-#
-# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of:
-#
-#   email
-#   password
-
-require 'rubygems'
-
-['json', 'cloudapp_api'].each do |gem|
-  begin
-    require gem
-  rescue LoadError
-    puts "You need to install #{gem}: gem install #{gem}"
-    exit!(1)
-  end
-end
-
-config_file = "#{ENV['HOME']}/.cloudapp"
-unless File.exist?(config_file)
-  puts "You need to type your email and password (one per line) into "+
-       "`~/.cloudapp`"
-  exit!(1)
-end
-
-email,password = File.read(config_file).split("\n")
-
-if ARGV[0].nil?
-   puts "You need to specify a file to upload."
-   exit!(1)
-end
-
-urls = []
-ARGV.each do |x|
-  CloudApp.authenticate(email,password)
-  puts "Attempting to upload #{x}"
-  url = CloudApp::Item.create(:upload, {:file => x}).url
-
-  # Say it for good measure.
-  puts "Uploaded #{x} to #{url}"
-
-  # Get the embed link.
-  url = "#{url}/#{ARGV[0].split('/').last}"
-  urls << url
-end
-
-# Copy it to your (Mac's) clipboard.
-`echo '#{urls.join(',')}' | tr -d "\n" | pbcopy`

From fa75aa8eeab920b341cfc3ab08fe182f430b775d Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 26 Jan 2024 21:25:50 -0800
Subject: [PATCH 16/53] reset my hostname in macos

---
 bin/dot               |  3 +++
 macos/set-hostname.sh | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100755 macos/set-hostname.sh

diff --git a/bin/dot b/bin/dot
index 54c8a3494b1..a88ad83394d 100755
--- a/bin/dot
+++ b/bin/dot
@@ -43,6 +43,9 @@ export ZSH=$HOME/.dotfiles
 # Set macOS defaults
 $ZSH/macos/set-defaults.sh
 
+# Set macOS hostname
+$ZSH/macos/set-hostname.sh
+
 # Install homebrew
 $ZSH/homebrew/install.sh 2>&1
 
diff --git a/macos/set-hostname.sh b/macos/set-hostname.sh
new file mode 100755
index 00000000000..c5ce7a0a1da
--- /dev/null
+++ b/macos/set-hostname.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# This corrects a shitty point of confusion with macOS where if you bounce
+# between wireless and wired connections, macOS will suddenly throw up its hands
+# and add a random-ass number to your hostname. Do it a couple times and you're
+# in like, the thousands appended to your hostname, which makes you look like a
+# chump when your machine is called "incredible-programmer-9390028", like
+# you're behind 9,390,027 other better programmers before you. Sheesh.
+#
+# Anyway, this runs in `dot` and only asks for your permission (usually TouchID)
+# if it actually needs to change your hostname for you, otherwise it's fast to
+# toss into `dot` anyway.
+#
+# None of this really matters in the big scheme of things, but it bothered me.
+
+hostname=$(scutil --get LocalHostName)
+
+# if hostname contains a hyphen and then a number, remove the hyphen and number
+normal_hostname=$(echo "$hostname" | sed 's/-[0-9]*$//')
+
+# if our hostname was changed by macOS, change it back
+if [ "$normal_hostname" != "$hostname" ]; then
+  echo "Changing hostname from $hostname to $normal_hostname"
+  scutil --set LocalHostName "$normal_hostname"
+fi

From f44aaa9e6e5ec106de79368727c6b848a8a8031f Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Sat, 3 Feb 2024 20:31:52 -0800
Subject: [PATCH 17/53] unused

---
 zsh/zshrc.symlink | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index baa385f2b2c..e3ade6421bc 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -48,5 +48,3 @@ zle -N up-line-or-beginning-search
 zle -N down-line-or-beginning-search
 bindkey "^[[A" up-line-or-beginning-search # Up
 bindkey "^[[B" down-line-or-beginning-search # Down
-
-eval "$(github-copilot-cli alias -- "$0")"

From f591e6c3c3fea25e96fae920864b2fe5201e7c2d Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 8 Feb 2024 17:45:59 -0800
Subject: [PATCH 18/53] add cloudflared

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index e7dd8ae110c..a0bc4f2fdf2 100644
--- a/Brewfile
+++ b/Brewfile
@@ -2,6 +2,7 @@ cask_args appdir: '/Applications'
 
 tap 'homebrew/bundle'
 
+brew 'cloudflared'
 brew 'imagemagick'
 brew 'spaceman-diff'
 brew 'spark'

From f5f10c21cf6327b887ffa32e3fa1573003f242e1 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 13 Feb 2024 08:30:17 -0800
Subject: [PATCH 19/53] whatsapp, doc?

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index a0bc4f2fdf2..a3bf16fefc0 100644
--- a/Brewfile
+++ b/Brewfile
@@ -18,6 +18,7 @@ cask 'plex'
 cask 'sonos'
 cask 'raycast'
 cask 'warp'
+cask 'whatsapp'
 cask 'visual-studio-code'
 cask 'vlc'
 cask 'zed'

From 6dd7d85e181569728197cb705fba6c958ce1a023 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 13 Feb 2024 10:39:40 -0800
Subject: [PATCH 20/53] add messenger

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index a3bf16fefc0..103dcf14e58 100644
--- a/Brewfile
+++ b/Brewfile
@@ -13,6 +13,7 @@ brew 'yt-dlp'
 cask 'airtable'
 cask 'arq'
 cask 'handbrake'
+cask 'messenger'
 cask 'notion-calendar'
 cask 'plex'
 cask 'sonos'

From 162e3f1be19560d03f9ecbf10ce9fde6dfbe00e1 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 27 Feb 2024 23:06:36 -0800
Subject: [PATCH 21/53] bring in dev brews

---
 Brewfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Brewfile b/Brewfile
index e7dd8ae110c..c815091b6db 100644
--- a/Brewfile
+++ b/Brewfile
@@ -3,6 +3,9 @@ cask_args appdir: '/Applications'
 tap 'homebrew/bundle'
 
 brew 'imagemagick'
+brew 'postgresql@14'
+brew 'redis'
+brew 'ruby-build'
 brew 'spaceman-diff'
 brew 'spark'
 brew 'stripe/stripe-cli/stripe'

From fd1b30834e5b922be35fee6af3e5cf65c4c7c32a Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 27 Feb 2024 23:09:23 -0800
Subject: [PATCH 22/53] transmission

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index c815091b6db..c53defd9c3c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -18,6 +18,7 @@ cask 'handbrake'
 cask 'notion-calendar'
 cask 'plex'
 cask 'sonos'
+cask 'transmission'
 cask 'raycast'
 cask 'warp'
 cask 'visual-studio-code'

From 7ec1659580f79fec0bfc6e6da8211ccbbcd91b54 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 1 Mar 2024 10:37:47 -0800
Subject: [PATCH 23/53] aiiiiii

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 315681f30b9..5998bc961ec 100644
--- a/Brewfile
+++ b/Brewfile
@@ -15,6 +15,7 @@ brew 'yt-dlp'
 
 cask 'airtable'
 cask 'arq'
+cask 'diffusionbee'
 cask 'handbrake'
 cask 'messenger'
 cask 'notion-calendar'

From 92f84b1a0c30561f5a41175709428ae068f8550c Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 5 Apr 2024 17:50:59 -0700
Subject: [PATCH 24/53] irb/ext/save-history is gone

weird one to track down, but:
https://github.com/ruby/irb/pull/613
---
 ruby/irbrc.symlink | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink
index 061e9e16c94..2334f4248ea 100644
--- a/ruby/irbrc.symlink
+++ b/ruby/irbrc.symlink
@@ -1,6 +1,5 @@
 #!/usr/bin/ruby
 require 'irb/completion'
-require 'irb/ext/save-history'
 require 'rubygems'
 
 IRB.conf[:SAVE_HISTORY] = 1000

From e178c8297d96dbc3e3b5033c5f0c03f6b73df63a Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 5 Apr 2024 17:51:31 -0700
Subject: [PATCH 25/53] neverending battle against macos

---
 macos/set-hostname.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/macos/set-hostname.sh b/macos/set-hostname.sh
index c5ce7a0a1da..a8e773c9b53 100755
--- a/macos/set-hostname.sh
+++ b/macos/set-hostname.sh
@@ -22,4 +22,5 @@ normal_hostname=$(echo "$hostname" | sed 's/-[0-9]*$//')
 if [ "$normal_hostname" != "$hostname" ]; then
   echo "Changing hostname from $hostname to $normal_hostname"
   scutil --set LocalHostName "$normal_hostname"
+  scutil --set ComputerName "$normal_hostname"
 fi

From 24e72b869b101ecde636aee1b25a73891962c786 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 5 Apr 2024 17:51:37 -0700
Subject: [PATCH 26/53] add 1p

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 5998bc961ec..06d8ec587f4 100644
--- a/Brewfile
+++ b/Brewfile
@@ -13,6 +13,7 @@ brew 'stripe/stripe-cli/stripe'
 brew 'wget'
 brew 'yt-dlp'
 
+cask '1password'
 cask 'airtable'
 cask 'arq'
 cask 'diffusionbee'

From 9a713e6a4fd777b1fa115f602f4045859c0f7206 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 5 Apr 2024 17:53:20 -0700
Subject: [PATCH 27/53] apparently the default now

---
 ruby/irbrc.symlink | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink
index 2334f4248ea..d8cf3001043 100644
--- a/ruby/irbrc.symlink
+++ b/ruby/irbrc.symlink
@@ -2,7 +2,6 @@
 require 'irb/completion'
 require 'rubygems'
 
-IRB.conf[:SAVE_HISTORY] = 1000
 IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb_history"
 
 IRB.conf[:PROMPT_MODE] = :SIMPLE

From 0e4a15fb1fd789495b74266c4735a6e5eea07415 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Wed, 17 Apr 2024 11:03:46 -0700
Subject: [PATCH 28/53] zoomZOOMzoom

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 06d8ec587f4..efddfe7dce0 100644
--- a/Brewfile
+++ b/Brewfile
@@ -29,3 +29,4 @@ cask 'whatsapp'
 cask 'visual-studio-code'
 cask 'vlc'
 cask 'zed'
+cask 'zoom'

From dba4eb4a9f2f9f045ceee6ccf709ef3ead835c67 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Wed, 1 May 2024 10:05:29 -0700
Subject: [PATCH 29/53] adb

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index efddfe7dce0..311d1c03616 100644
--- a/Brewfile
+++ b/Brewfile
@@ -15,6 +15,7 @@ brew 'yt-dlp'
 
 cask '1password'
 cask 'airtable'
+cask 'android-platform-tools'
 cask 'arq'
 cask 'diffusionbee'
 cask 'handbrake'

From 9be3b4dd396f2306f3ec726174b54429bc029207 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 6 May 2024 15:52:37 -0700
Subject: [PATCH 30/53] let's do brew upgrade in dot too

---
 bin/dot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/dot b/bin/dot
index a88ad83394d..63f9f9bf388 100755
--- a/bin/dot
+++ b/bin/dot
@@ -53,6 +53,9 @@ $ZSH/homebrew/install.sh 2>&1
 echo "› brew update"
 brew update
 
+echo "› brew upgrade"
+brew upgrade
+
 # Install software
 echo "› script/install"
 $ZSH/script/install

From 2b3e99ebe6b4acea944e520968a07a1a0e584d81 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Sun, 16 Jun 2024 20:05:26 -0700
Subject: [PATCH 31/53] mock

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 311d1c03616..42400fb855d 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,6 +10,7 @@ brew 'ruby-build'
 brew 'spaceman-diff'
 brew 'spark'
 brew 'stripe/stripe-cli/stripe'
+brew 'stripe/stripe-mock/stripe-mock'
 brew 'wget'
 brew 'yt-dlp'
 

From 5b3873be4fb21efcfdf5c6d3abc63ef9a4a501bc Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Sun, 16 Jun 2024 20:11:31 -0700
Subject: [PATCH 32/53] update dotfiles with dot

---
 bin/dot | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/dot b/bin/dot
index 63f9f9bf388..d84a178a29b 100755
--- a/bin/dot
+++ b/bin/dot
@@ -40,6 +40,10 @@ done
 
 export ZSH=$HOME/.dotfiles
 
+# Update dotfiles themselves
+echo "› git pull"
+git -C $ZSH pull
+
 # Set macOS defaults
 $ZSH/macos/set-defaults.sh
 

From 644d8748d1ecabe59d607b5463c48ef220b67b74 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 5 Sep 2024 10:41:53 -0700
Subject: [PATCH 33/53] Find Simulator.app better

---
 xcode/aliases.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xcode/aliases.zsh b/xcode/aliases.zsh
index 53dc5922efe..1c7c6c1c3a6 100644
--- a/xcode/aliases.zsh
+++ b/xcode/aliases.zsh
@@ -1,2 +1 @@
-alias ios="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app"
-alias watchos="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator\ \(Watch\).app"
+alias ios="open -a Simulator"

From ae59cc3cfc14181ff7feba6990b0f5a31bad4f37 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 4 Feb 2025 09:50:11 -0800
Subject: [PATCH 34/53] rebase

---
 git/gitconfig.symlink | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 7f0647ba36f..29e0e804c06 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -38,3 +38,5 @@
 
 [init]
 	defaultBranch = main
+[pull]
+	rebase = true

From b473497d086f209f15c4d7c1a93df471d3a4e477 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 4 Mar 2025 08:54:24 -0800
Subject: [PATCH 35/53] let's assume i switch editors frequently

---
 editors/env.zsh      | 1 +
 editors/windsurf.zsh | 1 +
 system/env.zsh       | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 editors/env.zsh
 create mode 100644 editors/windsurf.zsh

diff --git a/editors/env.zsh b/editors/env.zsh
new file mode 100644
index 00000000000..c0acfb8d1e0
--- /dev/null
+++ b/editors/env.zsh
@@ -0,0 +1 @@
+export EDITOR='windsurf'
\ No newline at end of file
diff --git a/editors/windsurf.zsh b/editors/windsurf.zsh
new file mode 100644
index 00000000000..4ec661acb02
--- /dev/null
+++ b/editors/windsurf.zsh
@@ -0,0 +1 @@
+export PATH="/Users/holman/.codeium/windsurf/bin:$PATH"
\ No newline at end of file
diff --git a/system/env.zsh b/system/env.zsh
index b99078ff655..e69de29bb2d 100644
--- a/system/env.zsh
+++ b/system/env.zsh
@@ -1 +0,0 @@
-export EDITOR='code'

From 800b655b21329cda4f51b692df93d2818aaed814 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Tue, 4 Mar 2025 08:55:04 -0800
Subject: [PATCH 36/53] fun ruby bug on macos

---
 ruby/rbenv.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ruby/rbenv.zsh b/ruby/rbenv.zsh
index cb93d589d6a..8b8542f8073 100644
--- a/ruby/rbenv.zsh
+++ b/ruby/rbenv.zsh
@@ -1,3 +1,6 @@
+# fun: https://bugs.ruby-lang.org/issues/14009
+export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+
 # init according to man page
 if (( $+commands[rbenv] ))
 then

From 14f6a99d07bdbba8e9036e74c9680fd88358395b Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Sun, 9 Mar 2025 23:44:15 -0700
Subject: [PATCH 37/53] add qlvideo to brewfile

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 42400fb855d..479178a24d0 100644
--- a/Brewfile
+++ b/Brewfile
@@ -23,6 +23,7 @@ cask 'handbrake'
 cask 'messenger'
 cask 'notion-calendar'
 cask 'plex'
+cask 'qlvideo'
 cask 'sonos'
 cask 'transmission'
 cask 'raycast'

From 3827bb3072fa73ff24136d9eb5d5b67ad7ef221c Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 24 Mar 2025 20:02:37 -0700
Subject: [PATCH 38/53] add windsurf

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 479178a24d0..044dd6a6b3c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -29,6 +29,7 @@ cask 'transmission'
 cask 'raycast'
 cask 'warp'
 cask 'whatsapp'
+cask 'windsurf'
 cask 'visual-studio-code'
 cask 'vlc'
 cask 'zed'

From b66f5640c59ce2b9503de15daf493fb9ce66738c Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 24 Mar 2025 20:03:38 -0700
Subject: [PATCH 39/53] add steam because i need my civ7

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 044dd6a6b3c..778d0da7262 100644
--- a/Brewfile
+++ b/Brewfile
@@ -25,6 +25,7 @@ cask 'notion-calendar'
 cask 'plex'
 cask 'qlvideo'
 cask 'sonos'
+cask 'steam'
 cask 'transmission'
 cask 'raycast'
 cask 'warp'

From ac19d837981442d2c1b7f4462bedc750b1b6655a Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 7 Aug 2025 16:53:22 -0700
Subject: [PATCH 40/53] use handbrake-app instead

---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 778d0da7262..2e9a0d26196 100644
--- a/Brewfile
+++ b/Brewfile
@@ -19,7 +19,7 @@ cask 'airtable'
 cask 'android-platform-tools'
 cask 'arq'
 cask 'diffusionbee'
-cask 'handbrake'
+cask 'handbrake-app'
 cask 'messenger'
 cask 'notion-calendar'
 cask 'plex'

From 12f3a869532e5bd712c16a7458abe1202682fd62 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 28 Aug 2025 18:39:37 -0700
Subject: [PATCH 41/53] Always keep Safari's URL preview open

---
 macos/set-defaults.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/macos/set-defaults.sh b/macos/set-defaults.sh
index 017c6e56070..f2d73256450 100755
--- a/macos/set-defaults.sh
+++ b/macos/set-defaults.sh
@@ -33,6 +33,11 @@ defaults write com.apple.dock wvous-bl-modifier -int 0
 # Hide Safari's bookmark bar.
 defaults write com.apple.Safari.plist ShowFavoritesBar -bool false
 
+# Always show Safari's "URL display" tab in the lower left on mouseover. Strangely
+# like, everyone and their LLMs on the internet thinks this is ShowStatusBar, but
+# it's not.
+defaults write com.apple.Safari ShowOverlayStatusBar -bool true
+
 # Set up Safari for development.
 defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true
 defaults write com.apple.Safari.plist IncludeDevelopMenu -bool true

From 2b7bf788b5a11ff5e8e0f3d455814d9b11357dce Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Wed, 10 Sep 2025 22:05:35 -0700
Subject: [PATCH 42/53] i also like to live... dangerously

---
 bin/a | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 bin/a

diff --git a/bin/a b/bin/a
new file mode 100755
index 00000000000..c3ddc41bf08
--- /dev/null
+++ b/bin/a
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Quick shortcut to ~*-~*AI*~-*~
+#
+# Load up a current $HotThing AI client with preferable settings (which is
+# usually yolo-lfg style anyway; computers wouldn't do anything to us).
+#
+# USAGE:
+#
+#   $ a
+#   # => opens the AI client. yeah, easy peasy.
+claude --dangerously-skip-permissions

From e6c8b2e15a770dd51abda153f6ec5c030c5e77f8 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 18 Sep 2025 14:36:27 -0700
Subject: [PATCH 43/53] add atuin

---
 Brewfile      | 2 +-
 atuin/env.zsh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 atuin/env.zsh

diff --git a/Brewfile b/Brewfile
index 2e9a0d26196..8e759a447c3 100644
--- a/Brewfile
+++ b/Brewfile
@@ -2,6 +2,7 @@ cask_args appdir: '/Applications'
 
 tap 'homebrew/bundle'
 
+brew 'atuin'
 brew 'cloudflared'
 brew 'imagemagick'
 brew 'postgresql@14'
@@ -16,7 +17,6 @@ brew 'yt-dlp'
 
 cask '1password'
 cask 'airtable'
-cask 'android-platform-tools'
 cask 'arq'
 cask 'diffusionbee'
 cask 'handbrake-app'
diff --git a/atuin/env.zsh b/atuin/env.zsh
new file mode 100644
index 00000000000..4bfbc3daeb5
--- /dev/null
+++ b/atuin/env.zsh
@@ -0,0 +1 @@
+eval "$(atuin init zsh)"
\ No newline at end of file

From 99f4757639d1e81ca7ee3164327b930d68ececd6 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 18 Sep 2025 14:56:58 -0700
Subject: [PATCH 44/53] ghostty in

---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 8e759a447c3..b96f0e86750 100644
--- a/Brewfile
+++ b/Brewfile
@@ -19,6 +19,7 @@ cask '1password'
 cask 'airtable'
 cask 'arq'
 cask 'diffusionbee'
+cask 'ghostty'
 cask 'handbrake-app'
 cask 'messenger'
 cask 'notion-calendar'
@@ -28,7 +29,6 @@ cask 'sonos'
 cask 'steam'
 cask 'transmission'
 cask 'raycast'
-cask 'warp'
 cask 'whatsapp'
 cask 'windsurf'
 cask 'visual-studio-code'

From 7afe7dd159aa56511aff0dcb420d2bf9e2a0e813 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 29 Sep 2025 09:19:23 -0700
Subject: [PATCH 45/53] back to zed

---
 editors/env.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editors/env.zsh b/editors/env.zsh
index c0acfb8d1e0..0fca5519166 100644
--- a/editors/env.zsh
+++ b/editors/env.zsh
@@ -1 +1 @@
-export EDITOR='windsurf'
\ No newline at end of file
+export EDITOR='zed'

From a657a2d40283ea5a0442db1fbc3f1f15b6fccf85 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Sat, 25 Oct 2025 09:27:06 -0700
Subject: [PATCH 46/53] no need for this

---
 zsh/zshrc.symlink | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index e3ade6421bc..d398ac84809 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -39,12 +39,3 @@ do
 done
 
 unset config_files
-
-# Better history
-# Credits to https://coderwall.com/p/jpj_6q/zsh-better-history-searching-with-arrow-keys
-autoload -U up-line-or-beginning-search
-autoload -U down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-bindkey "^[[A" up-line-or-beginning-search # Up
-bindkey "^[[B" down-line-or-beginning-search # Down

From 29716dc4f602debe7dd79b3b7091cbc141fb55ef Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 31 Oct 2025 22:13:44 -0700
Subject: [PATCH 47/53] add local/bin to path

---
 system/_path.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/_path.zsh b/system/_path.zsh
index 255c2cfca66..a1071068550 100644
--- a/system/_path.zsh
+++ b/system/_path.zsh
@@ -1,2 +1,2 @@
-export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
+export PATH="./bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"

From 5be4d53a8e114806aedd4fcaf259e5e6c6979f16 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 6 Nov 2025 17:51:27 -0800
Subject: [PATCH 48/53] pg 17

---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index b96f0e86750..0bd87ca56e2 100644
--- a/Brewfile
+++ b/Brewfile
@@ -5,7 +5,7 @@ tap 'homebrew/bundle'
 brew 'atuin'
 brew 'cloudflared'
 brew 'imagemagick'
-brew 'postgresql@14'
+brew 'postgresql@17'
 brew 'redis'
 brew 'ruby-build'
 brew 'spaceman-diff'

From 9aae4aaea74fe70592afa1138a37c1df8d9db0e0 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 8 Dec 2025 11:40:49 -0800
Subject: [PATCH 49/53] re-link pg

---
 homebrew/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/homebrew/install.sh b/homebrew/install.sh
index f01dbdc7f75..be72ff076eb 100755
--- a/homebrew/install.sh
+++ b/homebrew/install.sh
@@ -21,4 +21,7 @@ then
 
 fi
 
+# Link keg-only formulas that we want in PATH
+brew list | grep 'postgresql@' | xargs -I {} brew link {} --force 2>/dev/null
+
 exit 0

From 5b6e0b1af9ac62a621d01b93a2afadb78d80362e Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Fri, 12 Dec 2025 14:00:23 -0800
Subject: [PATCH 50/53] expand home path

---
 system/_path.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/_path.zsh b/system/_path.zsh
index a1071068550..ed7da9058f1 100644
--- a/system/_path.zsh
+++ b/system/_path.zsh
@@ -1,2 +1,2 @@
-export PATH="./bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
+export PATH="./bin:$HOME/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"

From 71caf26a299dd385ca00ac2d4a347d950de01be6 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 29 Dec 2025 20:42:27 -0800
Subject: [PATCH 51/53] codex is now a cask

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 0bd87ca56e2..e639085078f 100644
--- a/Brewfile
+++ b/Brewfile
@@ -18,6 +18,7 @@ brew 'yt-dlp'
 cask '1password'
 cask 'airtable'
 cask 'arq'
+cask 'codex'
 cask 'diffusionbee'
 cask 'ghostty'
 cask 'handbrake-app'

From a04bda55cde9b374b5c3cad7fecc51765fcde557 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Mon, 5 Jan 2026 17:11:49 -0800
Subject: [PATCH 52/53] install iina

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index e639085078f..d444027fc1e 100644
--- a/Brewfile
+++ b/Brewfile
@@ -22,6 +22,7 @@ cask 'codex'
 cask 'diffusionbee'
 cask 'ghostty'
 cask 'handbrake-app'
+cask 'iina'
 cask 'messenger'
 cask 'notion-calendar'
 cask 'plex'

From c6afa692d72e3baa25157cab40a446bee67a1781 Mon Sep 17 00:00:00 2001
From: Zach Holman <zach@zachholman.com>
Date: Thu, 12 Feb 2026 18:27:08 -0800
Subject: [PATCH 53/53] conductor

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index d444027fc1e..93aed700585 100644
--- a/Brewfile
+++ b/Brewfile
@@ -19,6 +19,7 @@ cask '1password'
 cask 'airtable'
 cask 'arq'
 cask 'codex'
+cask 'conductor'
 cask 'diffusionbee'
 cask 'ghostty'
 cask 'handbrake-app'