From 00e0c7188b7ce3b4d05dff58e46a72f1862f0894 Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Fri, 2 Jan 2026 18:39:53 -0600
Subject: [PATCH] refactor: simplify homebrew shellenv init without  brittle
 caching

---
 home/.chezmoitemplates/scripts/commonrc.fish.tmpl | 15 ++-------------
 home/.chezmoitemplates/scripts/commonrc.sh.tmpl   | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/home/.chezmoitemplates/scripts/commonrc.fish.tmpl b/home/.chezmoitemplates/scripts/commonrc.fish.tmpl
index fe557b7..bf8a244 100644
--- a/home/.chezmoitemplates/scripts/commonrc.fish.tmpl
+++ b/home/.chezmoitemplates/scripts/commonrc.fish.tmpl
@@ -45,20 +45,9 @@ else if test -f $HOME/.cargo/env
     set -a paths_to_add $CARGO_HOME/bin
 end
 
-# Homebrew (cached for performance - reduces startup time by ~14ms)
+# Homebrew
 if test -f /home/linuxbrew/.linuxbrew/bin/brew
-    set -l brew_cache "$HOME/.cache/brew_env.fish"
-    set -l brew_bin "/home/linuxbrew/.linuxbrew/bin/brew"
-
-    # Regenerate cache if: doesn't exist, >7 days old, or brew binary is newer
-    if not test -f "$brew_cache"; \
-       or test (math (date +%s) - (stat -c %Y "$brew_cache" 2>/dev/null || echo 0)) -gt 604800; \
-       or test (stat -c %Y "$brew_bin" 2>/dev/null || echo 0) -gt (stat -c %Y "$brew_cache" 2>/dev/null || echo 0)
-        mkdir -p (dirname "$brew_cache")
-        $brew_bin shellenv > "$brew_cache" 2>/dev/null
-    end
-
-    test -f "$brew_cache" && source "$brew_cache"
+    /home/linuxbrew/.linuxbrew/bin/brew shellenv fish | source
 end
 
 set -gx PYENV_ROOT $HOME/.pyenv
diff --git a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
index 36b3b83..d680db8 100644
--- a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
+++ b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
@@ -39,20 +39,9 @@ export HISHTORY_SERVER="https://hsh.{{ dopplerProjectJson.PRIVATE_DOMAIN }}"
 [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"
 
 ## Package Managers
-# Homebrew (cached for performance - reduces startup time by ~14ms)
+# Homebrew
 if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
-  BREW_CACHE="$HOME/.cache/brew_env.sh"
-  BREW_BIN="/home/linuxbrew/.linuxbrew/bin/brew"
-
-  # Regenerate cache if: doesn't exist, >7 days old, or brew binary is newer
-  if [ ! -f "$BREW_CACHE" ] || \
-     [ $(( $(date +%s) - $(stat -c %Y "$BREW_CACHE" 2>/dev/null || echo 0) )) -gt 604800 ] || \
-     [ "$BREW_BIN" -nt "$BREW_CACHE" ]; then
-    mkdir -p "$(dirname "$BREW_CACHE")"
-    "$BREW_BIN" shellenv > "$BREW_CACHE" 2>/dev/null
-  fi
-
-  [ -f "$BREW_CACHE" ] && . "$BREW_CACHE"
+  eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 fi
 
 ## JavaScript Ecosystem