skim: fix fish shell keybindings

This fixes a typo that prevented the fish keybindings from being loaded.
Also, the keybindings are now only loaded if programs.skim.keybindings
is true, which matches the behavior for bash and zsh.
This commit is contained in:
InternetUnexplorer 2022-12-08 22:38:00 -08:00
parent 1c9ffcf707
commit 86ae48a4bf
2 changed files with 6 additions and 4 deletions

View file

@ -6,7 +6,7 @@ in
{
options = {
programs.skim = {
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy Completion with skim");
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with skim");
keybindings = mkEnableOption (mdDoc "skim keybindings");
package = mkPackageOption pkgs "skim" {};
};
@ -26,5 +26,9 @@ in
'' + optionalString cfg.keybindings ''
source ${cfg.package}/share/skim/key-bindings.zsh
'';
programs.fish.interactiveShellInit = optionalString cfg.keybindings ''
source ${cfg.package}/share/skim/key-bindings.fish && skim_key_bindings
'';
};
}

View file

@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec {
install -D -m 444 plugin/skim.vim -t $vim/plugin
install -D -m 444 shell/* -t $out/share/skim
install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/sk_key_bindings.fish
mkdir -p $out/share/fish/vendor_conf.d
echo sk_key_bindings > $out/share/fish/vendor_conf.d/load-sk-key-bindings.fish
installManPage man/man1/*
cat <<SCRIPT > $out/bin/sk-share