From f61ffaa4ff1429d9ff2b0c3b6793b396207a3ef4 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 23 Dec 2025 17:58:24 +0000
Subject: [PATCH] [macos] Update Brewfile

---
 macos/.config/{ => dotfiles}/dockConfig.txt |  0
 macos/.config/{ => homebrew}/Brewfile       | 20 +++++++++++---------
 macos/.config/shell-common/macos.sh         |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)
 rename macos/.config/{ => dotfiles}/dockConfig.txt (100%)
 rename macos/.config/{ => homebrew}/Brewfile (94%)

diff --git a/macos/.config/dockConfig.txt b/macos/.config/dotfiles/dockConfig.txt
similarity index 100%
rename from macos/.config/dockConfig.txt
rename to macos/.config/dotfiles/dockConfig.txt
diff --git a/macos/.config/Brewfile b/macos/.config/homebrew/Brewfile
similarity index 94%
rename from macos/.config/Brewfile
rename to macos/.config/homebrew/Brewfile
index 608c2f2..91ef9fb 100644
--- a/macos/.config/Brewfile
+++ b/macos/.config/homebrew/Brewfile
@@ -1,31 +1,33 @@
 tap "dart-lang/dart"
 tap "fluxcd/tap"
 tap "go-task/tap"
-tap "homebrew/bundle"
 tap "sass/sass"
 
 brew "awscli"
 brew "awslogs"
 brew "dockutil"
 brew "fluxcd/tap/flux"
-brew "go"
+brew "fzf"
 brew "go-task/tap/go-task"
+brew "go"
+brew "hashicorp/tap/terraform"
 brew "hugo"
+brew "jq"
 brew "k9s"
 brew "kubectl-cnpg"
-brew "kubeseal"
+brew "kubelogin"
 brew "kubernetes-cli"
+brew "kubeseal"
 brew "mas"
 brew "poetry"
+brew "python@3.14"
 brew "sass/sass/sass"
 brew "smartmontools"
-brew "hashicorp/tap/terraform"
+brew "terraform-docs"
 brew "terraform-local"
 brew "tz"
 brew "uv"
 brew "yazi"
-brew "jq"
-brew "fzf"
 
 cask "appcleaner"
 cask "balenaetcher"
@@ -43,11 +45,11 @@ cask "vial"
 cask "viscosity"
 cask "visual-studio-code"
 cask "vlc"
-cask "wireshark"
+cask "wireshark-app"
 
-cask "font-iosevka"
 cask "font-input"
 cask "font-inter"
+cask "font-iosevka"
 cask "font-jetbrains-mono"
 
 mas "AmorphousDiskMark", id: 1168254295
@@ -58,8 +60,8 @@ mas "Flighty – Live Flight Tracker", id: 1358823008
 mas "Hand Mirror", id: 1502839586
 mas "Hidden Bar", id: 1452453066
 mas "Home Assistant", id: 1099568401
-mas "Hush", id: 1544743900
 mas "Hush Nag Blocker", id: 1544743900
+mas "Hush", id: 1544743900
 mas "Ivory", id: 6444602274
 mas "OTP Auth", id: 1471867429
 mas "Tailscale", id: 1475387142
diff --git a/macos/.config/shell-common/macos.sh b/macos/.config/shell-common/macos.sh
index ab82da4..837c445 100644
--- a/macos/.config/shell-common/macos.sh
+++ b/macos/.config/shell-common/macos.sh
@@ -12,7 +12,7 @@ function itsok() {
 # Runs a brew bundle check and installs missing packages
 # Usage: update-brewfile
 function update-brewfile() {
-    brew bundle check --file "$HOME/.config/Brewfile" || brew bundle --cleanup -f --file "$HOME/.config/Brewfile"
+    brew bundle check --global || brew bundle --cleanup -f --global
 }
 
 # Updates the macOS Dock based on a configuration file
@@ -31,6 +31,6 @@ function update-dock() {
         if [ "$app_type" = "persisentApps" ]; then
             dockutil --move "$app_name" -p $idx
         fi
-    done < ~/.dotfiles/macos/.config/dockConfig.txt
+    done < ~/.dotfiles/macos/.config/dotfiles/dockConfig.txt
     killall Dock
 }