From cffc9938c71ef5f80df032ff67f9f643f979579e Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 18 Oct 2023 10:26:09 +0200 Subject: [PATCH] fzf: fix fish integration Since fzf 0.43.0, the fzf_key_bindings function is only defined when fish is running interactively, see [1]. This caused errors when entering non-interactive fish shells since we called fzf_key_bindings during startup. [1]: https://github.com/junegunn/fzf/commit/7e89458a3b58c047c10494a5cb53d921fb08b4f3 --- modules/programs/fzf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix index 7544c1eff..02691e37d 100644 --- a/modules/programs/fzf.nix +++ b/modules/programs/fzf.nix @@ -190,7 +190,7 @@ in { fi ''); - programs.fish.shellInit = mkIf cfg.enableFishIntegration '' + programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' source ${cfg.package}/share/fzf/key-bindings.fish && fzf_key_bindings ''; };