Commit 9f840d9549fd

@@ -84,7 +84,7 @@ in
     aichat
     # aider-chat
     master.claude-code
-    master.claude-code-acp
+    master.claude-agent-acp
     master.gemini-cli
     master.opencode
     pi-coding-agent

@@ -10,14 +10,9 @@ let
 in
 {
   # Only declare options that the upstream home-manager module does NOT provide.
-  # Upstream (programs.lazyworktree) already declares: enable, package, settings.
+  # Upstream (programs.lazyworktree) already declares: enable, package, settings,
+  # enableZshIntegration, enableBashIntegration, enableFishIntegration, shellWrapperName.
   options.programs.lazyworktree = {
-    enableZshIntegration = lib.mkEnableOption "zsh integration" // {
-      default = true;
-    };
-
-    enableBashIntegration = lib.mkEnableOption "bash integration";
-
     aliases = lib.mkOption {
       type = types.attrsOf types.str;
       default = { };

@@ -15,20 +15,20 @@ in
     # ...
     # });
     # custom-caddy = import ./custom-caddy.nix { pkgs = prev; };
-    go_1_25_3 = prev.go_1_25.overrideAttrs (_finalAttrs: {
-      version = "1.25.3";
+    go_1_25_5 = prev.go_1_25.overrideAttrs (_finalAttrs: {
+      version = "1.25.5";
       src = final.fetchurl {
-        url = "https://go.dev/dl/go1.25.3.src.tar.gz";
-        hash = "sha256-qBpLpZPQAV4QxR4mfeP/B8eskU38oDfZUX0ClRcJd5U=";
+        url = "https://go.dev/dl/go1.25.5.src.tar.gz";
+        hash = "sha256-IqX9CpHvzSihsFNxBrmVmygEth9Zw3WLUejlQpwalU8=";
       };
     });
 
-    buildGo1253Module = prev.buildGoModule.override {
-      go = final.go_1_25_3;
+    buildGo1255Module = prev.buildGoModule.override {
+      go = final.go_1_25_5;
     };
 
     cosign = prev.cosign.override {
-      buildGoModule = final.buildGo1253Module;
+      buildGoModule = final.buildGo1255Module;
     };
 
     # Use feishin from master with mpv-unwrapped to avoid wrapper breakage
@@ -37,13 +37,6 @@ in
       mpv-unwrapped = prev.mpv-unwrapped;
     };
 
-    # Workaround for Go 1.25 pkg-config --define-prefix bug
-    # https://github.com/NixOS/nixpkgs/issues/481611
-    # https://github.com/golang/go/issues/77387
-    # Remove once Go 1.25.8 lands in nixpkgs
-    navidrome = prev.navidrome.overrideAttrs (_old: {
-      CGO_CFLAGS_ALLOW = ".*--define-prefix.*";
-    });
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
@@ -55,7 +48,7 @@ in
       overlays = [
         (_final: _prev: {
           inherit (_prev) claude-code;
-          inherit (_prev) claude-code-acp;
+          inherit (_prev) claude-agent-acp;
           inherit (_prev) codex;
           inherit (_prev) opencode;
           inherit (_prev) gemini-cli;

@@ -466,7 +466,7 @@ in
     # Use Caddy with rate-limit plugin
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/mholt/caddy-ratelimit@v0.1.1-0.20250915152450-04ea34edc0c4" ];
-      hash = "sha256-vtiYbCTxotxCQ3+Z+hDOuKy9QxNPKYtVP1FsrtDHq44=";
+      hash = "sha256-oR0UmdKmAvpXk0i6mUJmVF6dL9uZ8Ff9tTnLZiNGBPc=";
     };
 
     # Enable Prometheus metrics on VPN interface only

@@ -468,7 +468,7 @@ in
     # Use Caddy with rate-limit plugin
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/mholt/caddy-ratelimit@v0.1.1-0.20250915152450-04ea34edc0c4" ];
-      hash = "sha256-vtiYbCTxotxCQ3+Z+hDOuKy9QxNPKYtVP1FsrtDHq44=";
+      hash = "sha256-oR0UmdKmAvpXk0i6mUJmVF6dL9uZ8Ff9tTnLZiNGBPc=";
     };
 
     # Enable Prometheus metrics on VPN interface only