nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcfly: Fix fzf overriding mcfly's Ctrl+R bind on fish(#6736)

Browse source 
This commit moves both mcfly and mcfly-fzf into the main is-interactive block for fish, which is technically unneccesary as the checks are done internally (but mcfly-fzf is broken in this regard bnprks/mcfly-fzf#10)
This commit is contained in:
wyyllou 2025-03-31 17:23:33 +01:00 • committed by GitHub
parent 216690777e
commit ccd7df836e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/programs/mcfly.nix
View file

@ -23,9 +23,7 @@ let
fishIntegration = ''
${getExe pkgs.mcfly} init fish | source
'' + optionalString cfg.fzf.enable ''
if status is-interactive
eval "$(${getExe pkgs.mcfly-fzf} init fish)"
end
eval "$(${getExe pkgs.mcfly-fzf} init fish)"
'';
zshIntegration = ''
@ -143,7 +141,8 @@ in {
programs.zsh.initContent = mkIf cfg.enableZshIntegration zshIntegration;
programs.fish.shellInit = mkIf cfg.enableFishIntegration fishIntegration;
programs.fish.interactiveShellInit =
mkIf cfg.enableFishIntegration fishIntegration;
home.sessionVariables.MCFLY_KEY_SCHEME = cfg.keyScheme;