From 171915bfce41018528fda9960211e81946d999b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B?= Date: Thu, 27 Mar 2025 14:40:07 +0100 Subject: [PATCH] fzf: fix zsh integration (keybinds rewritten by omz) (#6712) fzf history keybind (^R) was being rewritten by omz. This PR moves the initialization of the fzf zsh integration just after omz integration (but sill before other history managers, eg: atuin) --- modules/programs/fzf.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix index 518ea22a7..77a431f33 100644 --- a/modules/programs/fzf.nix +++ b/modules/programs/fzf.nix @@ -195,8 +195,10 @@ in { # Note, since fzf unconditionally binds C-r we use `mkOrder` to make the # initialization show up a bit earlier. This is to make initialization of # other history managers, like mcfly or atuin, take precedence. + # Still needs to be initialized after oh-my-zsh (order 800), otherwise + # omz will take precedence. programs.zsh.initContent = - mkIf cfg.enableZshIntegration (mkOrder 200 zshIntegration); + mkIf cfg.enableZshIntegration (mkOrder 810 zshIntegration); programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration (mkOrder 200 fishIntegration);