From 75bdebb4978b2fe23dcd6b33ecc78243cdab6143 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 7 May 2026 01:16:54 -0700 Subject: [PATCH 1/7] bump --- Brewfile | 21 +++++++++++++++++---- dotfiles/bxignore | 4 ++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 dotfiles/bxignore diff --git a/Brewfile b/Brewfile index 366e189..e76e3d6 100644 --- a/Brewfile +++ b/Brewfile @@ -1,6 +1,8 @@ tap "dart-lang/dart" +tap "holtwick/tap" tap "sass/sass" + brew "ack" brew "acme.sh" brew "age" @@ -8,11 +10,11 @@ brew "autoconf" brew "automake" brew "b2-tools" brew "bat" -brew "bazelisk" brew "binwalk" brew "cask" brew "ccache" brew "certbot" +brew "cloudflared" brew "cmake" brew "colima" brew "devcontainer" @@ -22,6 +24,7 @@ brew "direnv" brew "duck" brew "earthly" brew "esptool" +brew "fish" brew "gh" brew "ghidra", link: false brew "git" @@ -31,14 +34,18 @@ brew "gnupg" brew "go" brew "gradle" brew "hf" +brew "holtwick/tap/bx" brew "htop" brew "httpie" -brew "huggingface-cli" brew "hugo" brew "imagemagick" brew "john-jumbo" brew "jq" +brew "kubeconform" +brew "kubectx" +brew "librsvg" brew "lima" +brew "minikube" brew "mise" brew "mosh" brew "neovim" @@ -71,6 +78,7 @@ brew "yt-dlp" brew "zlib" brew "zsh-syntax-highlighting" + cask "codeql" cask "cyberduck" cask "font-fira-code-nerd-font" @@ -81,9 +89,9 @@ cask "font-inconsolata-nerd-font" cask "font-symbols-only-nerd-font" cask "font-terminess-ttf-nerd-font" cask "ghidra" -cask "gimp" cask "github" cask "iterm2" +cask "keybase" cask "macfuse" cask "meld" cask "mitmproxy" @@ -93,6 +101,7 @@ cask "rectangle" cask "scroll-reverser" cask "temurin" cask "veracrypt" +cask "wezterm" cask "zulu@17" def is_corp? @@ -100,9 +109,13 @@ def is_corp? `profiles status -type enrollment 2>/dev/null`.include?("Enrolled via DEP: Yes") end +if is_corp? + brew "bazelisk", link: false +end + # non-corp if !is_corp? - brew "bazel" + brew "bazelisk" brew "openssh" cask "claude-code" cask "cryptomator" diff --git a/dotfiles/bxignore b/dotfiles/bxignore new file mode 100644 index 0000000..34149e2 --- /dev/null +++ b/dotfiles/bxignore @@ -0,0 +1,4 @@ +# Credentials +.ssh +Passwords.kdbx +Passwords.kdbx.age From 77b8374871fe557ff3b096ccb7d503d044295781 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Tue, 5 May 2026 08:45:57 -0700 Subject: [PATCH 2/7] Add difft difftool --- dotfiles/gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 0a2a125..80f7743 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -19,6 +19,9 @@ [difftool] prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" + [alias] st = status last = log -1 HEAD From 6e3c3dd269fce7ffe9c753c72c0d0fb8a4997746 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 7 May 2026 08:50:45 -0700 Subject: [PATCH 3/7] Move keybase to off-corp brewfile --- Brewfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index e76e3d6..4d23ebf 100644 --- a/Brewfile +++ b/Brewfile @@ -91,7 +91,6 @@ cask "font-terminess-ttf-nerd-font" cask "ghidra" cask "github" cask "iterm2" -cask "keybase" cask "macfuse" cask "meld" cask "mitmproxy" @@ -117,9 +116,11 @@ end if !is_corp? brew "bazelisk" brew "openssh" + cask "claude-code" cask "cryptomator" cask "gcloud-cli" cask "google-cloud-sdk" + cask "keybase" cask "orbstack" end From f8ec9cc338c44364cfe049e159f101ff46054f6a Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 7 May 2026 08:56:32 -0700 Subject: [PATCH 4/7] fix update_brewfile --- bin/macos/update_brewfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/macos/update_brewfile b/bin/macos/update_brewfile index a099df5..7c950a7 100755 --- a/bin/macos/update_brewfile +++ b/bin/macos/update_brewfile @@ -251,7 +251,13 @@ def main(args): if last_type and e.pkg_type != last_type: output_lines.append("") last_type = e.pkg_type - output_lines.extend(e.to_lines()) + + lines = e.to_lines() + # If we just added a blank line, and the new lines start with one, skip the first new line + if output_lines and output_lines[-1] == "" and lines and lines[0] == "": + output_lines.extend(lines[1:]) + else: + output_lines.extend(lines) new_content = "\n".join(output_lines) if footer: From b1d1c42a021369260f995be4a3b0d13084db4212 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 7 May 2026 13:43:44 -0700 Subject: [PATCH 5/7] bump brewfile --- Brewfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Brewfile b/Brewfile index 4d23ebf..5aa44db 100644 --- a/Brewfile +++ b/Brewfile @@ -2,7 +2,6 @@ tap "dart-lang/dart" tap "holtwick/tap" tap "sass/sass" - brew "ack" brew "acme.sh" brew "age" @@ -78,7 +77,6 @@ brew "yt-dlp" brew "zlib" brew "zsh-syntax-highlighting" - cask "codeql" cask "cyberduck" cask "font-fira-code-nerd-font" @@ -89,6 +87,7 @@ cask "font-inconsolata-nerd-font" cask "font-symbols-only-nerd-font" cask "font-terminess-ttf-nerd-font" cask "ghidra" +cask "gimp" cask "github" cask "iterm2" cask "macfuse" From 158d9f6e4ea4f0abe518c0efa949143309526768 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 9 May 2026 18:47:15 -0700 Subject: [PATCH 6/7] Update Brewfile --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 5aa44db..836bad3 100644 --- a/Brewfile +++ b/Brewfile @@ -118,6 +118,7 @@ if !is_corp? cask "claude-code" cask "cryptomator" + cask "keepassxc" cask "gcloud-cli" cask "google-cloud-sdk" cask "keybase" From d8b4991419724b55db08400af7a4aa14297e4db3 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Tue, 19 May 2026 13:44:38 -0700 Subject: [PATCH 7/7] End homebrew hints --- dotfiles/shenv | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/shenv b/dotfiles/shenv index 2afe628..33475cd 100755 --- a/dotfiles/shenv +++ b/dotfiles/shenv @@ -15,6 +15,7 @@ export DEBEMAIL="david@systemoverlord.com" export DEBFULLNAME="David Tomaschik" export LESS="-MR" export QUOTING_STYLE="literal" # Coreutils quotes +export HOMEBREW_NO_ENV_HINTS=1 # Fix gnome-terminal if [ "$TERM" = "xterm" ] && [ "$COLORTERM" = "gnome-terminal" ] ; then