bump brewfile

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,9 +87,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"
@@ -117,9 +115,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

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:

dotfiles/gitconfig

@@ -19,6 +19,9 @@
 [difftool]
   prompt = false
 
+[difftool "difftastic"]
+  cmd = difft "$LOCAL" "$REMOTE"
+
 [alias]
   st = status
   last = log -1 HEAD