summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Sellmeier <mail@sebastian-sellmeier.de>2024-04-10 22:50:39 +0200
committerSebastian Sellmeier <mail@sebastian-sellmeier.de>2024-04-10 22:50:39 +0200
commitddc815f72e2b46c8c667b4886bf105f215ed92e0 (patch)
tree5febcd318f1476f839138690c7863ae0fb1b05fe
parentMerge pull request #303036 from r-ryantm/auto-update/python311Packages.boto3-... (diff)
downloadnixpkgs-origin/bugfix_fzfShellcompletion.tar.gz
fzf: Fix shell-completion overrides existing interactiveShellInit (fixes #303195)origin/bugfix_fzfShellcompletion
-rw-r--r--nixos/modules/programs/fzf.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/programs/fzf.nix b/nixos/modules/programs/fzf.nix
index 05e39c43c11b..cc0cf9a63d78 100644
--- a/nixos/modules/programs/fzf.nix
+++ b/nixos/modules/programs/fzf.nix
@@ -25,18 +25,18 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.fzf ];
- programs.bash.interactiveShellInit = ''
+ programs.bash.interactiveShellInit = lib.mkAfter ''
eval "$(${getExe pkgs.fzf} --bash)"
'';
- programs.fish.interactiveShellInit = ''
+ programs.fish.interactiveShellInit = lib.mkAfter ''
${getExe pkgs.fzf} --fish | source
'';
programs.zsh = {
- interactiveShellInit = optionalString (!config.programs.zsh.ohMyZsh.enable) ''
+ interactiveShellInit = lib.mkAfter (optionalString (!config.programs.zsh.ohMyZsh.enable) ''
eval "$(${getExe pkgs.fzf} --zsh)"
- '';
+ '');
ohMyZsh.plugins = mkIf (config.programs.zsh.ohMyZsh.enable) [ "fzf" ];
};