tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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.

InternetUnexplorer 86ae48a4 1c9ffcf7

+6 -4
unified split
+5 -1
nixos/modules/programs/skim.nix
··· 6 { 7 options = { 8 programs.skim = { 9 - fuzzyCompletion = mkEnableOption (mdDoc "fuzzy Completion with skim"); 10 keybindings = mkEnableOption (mdDoc "skim keybindings"); 11 package = mkPackageOption pkgs "skim" {}; 12 }; ··· 25 source ${cfg.package}/share/skim/completion.zsh 26 '' + optionalString cfg.keybindings '' 27 source ${cfg.package}/share/skim/key-bindings.zsh 28 ''; 29 }; 30 }
··· 6 { 7 options = { 8 programs.skim = { 9 + fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with skim"); 10 keybindings = mkEnableOption (mdDoc "skim keybindings"); 11 package = mkPackageOption pkgs "skim" {}; 12 }; ··· 25 source ${cfg.package}/share/skim/completion.zsh 26 '' + optionalString cfg.keybindings '' 27 source ${cfg.package}/share/skim/key-bindings.zsh 28 + ''; 29 + 30 + programs.fish.interactiveShellInit = optionalString cfg.keybindings '' 31 + source ${cfg.package}/share/skim/key-bindings.fish && skim_key_bindings 32 ''; 33 }; 34 }
+1 -3
pkgs/tools/misc/skim/default.nix
··· 30 install -D -m 444 plugin/skim.vim -t $vim/plugin 31 32 install -D -m 444 shell/* -t $out/share/skim 33 - install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/sk_key_bindings.fish 34 - mkdir -p $out/share/fish/vendor_conf.d 35 - echo sk_key_bindings > $out/share/fish/vendor_conf.d/load-sk-key-bindings.fish 36 installManPage man/man1/* 37 38 cat <<SCRIPT > $out/bin/sk-share
··· 30 install -D -m 444 plugin/skim.vim -t $vim/plugin 31 32 install -D -m 444 shell/* -t $out/share/skim 33 + 34 installManPage man/man1/* 35 36 cat <<SCRIPT > $out/bin/sk-share