Merge pull request #205251 from InternetUnexplorer/fix-fish-skim-keybindings

This commit is contained in:
Sandro 2022-12-09 10:02:04 +01:00 committed by GitHub
commit 18ab3af0d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -6,7 +6,7 @@ in
{ {
options = { options = {
programs.skim = { programs.skim = {
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy Completion with skim"); fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with skim");
keybindings = mkEnableOption (mdDoc "skim keybindings"); keybindings = mkEnableOption (mdDoc "skim keybindings");
package = mkPackageOption pkgs "skim" {}; package = mkPackageOption pkgs "skim" {};
}; };
@ -26,5 +26,9 @@ in
'' + optionalString cfg.keybindings '' '' + optionalString cfg.keybindings ''
source ${cfg.package}/share/skim/key-bindings.zsh 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 plugin/skim.vim -t $vim/plugin
install -D -m 444 shell/* -t $out/share/skim 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/* installManPage man/man1/*
cat <<SCRIPT > $out/bin/sk-share cat <<SCRIPT > $out/bin/sk-share