From 4bd428776e0c6d40ef9fff0098ddc85129a8d9fb Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 1 Nov 2026 23:53:30 +0800
Subject: [PATCH] fix(darwin): pass the Homebrew mirror env through
 onActivation.extraEnv

nix-darwin runs `brew bundle` as `sudo --preserve-env=PATH ... env ...`,
so the variables the mkBefore'd activation snippet exported never reached
brew; activation was using the default upstream endpoints. Set them via
homebrew.onActivation.extraEnv, which nix-darwin puts on the `env` command
line (evaluated on fern), and drop the snippet.

Assisted-by: Claude Code (claude-opus-5-5)
---
 modules/darwin/apps.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix
index 8ea3b318..1c2b4f27 100644
--- a/modules/darwin/apps.nix
+++ b/modules/darwin/apps.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:
@@ -20,8 +19,7 @@
 #
 ##########################################################################
 let
-  # Homebrew Mirror
-  # NOTE: is only useful when you run `brew install` manually! (not via nix-darwin)
+  # Homebrew Mirror, for both `brew bundle` during activation and manual `brew install`.
   homebrew_mirror_env = {
     # tuna mirror
     # HOMEBREW_API_DOMAIN = "https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/api";
@@ -49,11 +47,6 @@ let
     # HTTP_PROXY = "http://127.0.0.1:7890";
     # HTTPS_PROXY = "http://127.0.0.1:7890";
   };
-
-  homebrew_env_script = lib.attrsets.foldlAttrs (
-    acc: name: value:
-    acc + "\nexport ${name}=${value}"
-  ) "" (homebrew_mirror_env // local_proxy_env);
 in
 {
   # Install packages from nix's official package repository.
@@ -78,12 +71,6 @@ in
   # Set variables for you to manually install homebrew packages.
   // homebrew_mirror_env;
 
-  # Set environment variables for nix-darwin before run `brew bundle`.
-  system.activationScripts.homebrew.text = lib.mkBefore ''
-    echo >&2 '${homebrew_env_script}'
-    ${homebrew_env_script}
-  '';
-
   # Create /etc/zshrc that loads the nix-darwin environment.
   # this is required if you want to use darwin's default shell - zsh
   programs.zsh.enable = true;
@@ -102,6 +89,9 @@ in
       upgrade = false; # Upgrade outdated casks, formulae, and App Store apps
       # 'zap': uninstalls all formulae(and related files) not listed in the generated Brewfile
       cleanup = "zap";
+      # nix-darwin runs `brew bundle` through sudo, which drops the activation
+      # script's environment, so pass the mirror/proxy settings explicitly.
+      extraEnv = homebrew_mirror_env // local_proxy_env;
     };
 
     # Applications to install from Mac App Store using mas.