Merge: fzf: don't source automatically (#433661)

pyrox.dev / nixpkgs

fork atom

lol

fork atom

authored by

Maximilian Bosch and committed by

GitHub 6 months ago 981e3cb9 c601566b

+1 -7

2 changed files

expand all

nixos

modules

programs

fzf.nix

pkgs

by-name

fzf

package.nix

+1 -1

nixos/modules/programs/fzf.nix

··· 44 }; 45 46 fish.interactiveShellInit = lib.optionalString cfg.keybindings '' 47 - source ${pkgs.fzf}/share/fzf/key-bindings.fish 48 ''; 49 }; 50 };

··· 44 }; 45 46 fish.interactiveShellInit = lib.optionalString cfg.keybindings '' 47 + source ${pkgs.fzf}/share/fzf/key-bindings.fish && fzf_key_bindings 48 ''; 49 }; 50 };

-6

pkgs/by-name/fz/fzf/package.nix

··· 65 66 # Install shell integrations 67 install -D shell/* -t $out/share/fzf/ 68 - install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish 69 - mkdir -p $out/share/fish/vendor_conf.d 70 - cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish 71 - status is-interactive; or exit 0 72 - fzf_key_bindings 73 - EOF 74 75 cat <<SCRIPT > $out/bin/fzf-share 76 #!${runtimeShell}

··· 65 66 # Install shell integrations 67 install -D shell/* -t $out/share/fzf/ 68 69 cat <<SCRIPT > $out/bin/fzf-share 70 #!${runtimeShell}