From 76d958cd7a4736fbac7a2c1110330ea5afccca2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pacana?= <pawel.pacana@chattermill.io>
Date: Wed, 26 Aug 2026 15:08:54 +0200
Subject: [PATCH] Load devenv hook before hydro

* Put the devenv fish hook in conf.d so prompt-time activation runs before hydro starts async git jobs.

* This prevents wtc from entering a new devenv worktree with a live hydro background job that blocks clean shell exit.
---
 modules/fish.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/fish.nix b/modules/fish.nix
index 2989d9e..4e2ffdf 100644
--- a/modules/fish.nix
+++ b/modules/fish.nix
@@ -193,8 +193,6 @@
     '';
 
     interactiveShellInit = lib.mkAfter ''
-      ${pkgs.devenv}/bin/devenv hook fish | source
-
       function fzf-history-widget -d "Show command history"
           set -l fzf_query (commandline)
           set -lx FZF_DEFAULT_OPTS "$FZF_DEFAULT_OPTS --scheme=history --read0 --print0 --no-multi-line --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS"
@@ -211,6 +209,11 @@
     '';
   };
 
+  # Prompt-time devenv activation must run before hydro starts async git jobs.
+  xdg.configFile."fish/conf.d/00-devenv.fish".text = ''
+    status is-interactive; and ${pkgs.devenv}/bin/devenv hook fish | source
+  '';
+
   # Named to sort before plugin-hydro.fish: hydro bakes hydro_symbol_prompt
   # into _hydro_status as its conf.d loads, so the overrides must exist first.
   xdg.configFile."fish/conf.d/hydro-theme.fish".text = ''
-- 
2.51.2