-
-
Notifications
You must be signed in to change notification settings - Fork 13.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fzf: 0.47.0 -> 0.49.0 #298692
Merged
Merged
fzf: 0.47.0 -> 0.49.0 #298692
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
debcd56
fzf: 0.47.0 -> 0.48.1
r-ryantm e3812e1
fzf: Update package and module (shell-completions)
SebTM 7eeea20
fzf: 0.48.1 -> 0.49.0
marsam 1035a9e
fzf: remove fzf-share helper
marsam 41d1ade
fzf: remove perl dependency
marsam 9d27034
nixos/fzf: fix fish shell commmand
marsam de5b2ef
doc: replace fzf-share mention with sk-share from Skim package
marsam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,46 @@ | ||
{ pkgs, config, lib, ... }: | ||
|
||
with lib; | ||
|
||
let | ||
cfg = config.programs.fzf; | ||
|
||
in | ||
{ | ||
imports = [ | ||
(lib.mkRemovedOptionModule [ "programs" "fzf" "keybindings" ] '' | ||
Use "programs.fzf.enabled" instead, due to fzf upstream-change it's not possible to load shell-completion and keybindings separately. | ||
If you want to change/disable certain keybindings please check the fzf-documentation. | ||
'') | ||
(lib.mkRemovedOptionModule [ "programs" "fzf" "fuzzyCompletion" ] '' | ||
Use "programs.fzf.enabled" instead, due to fzf upstream-change it's not possible to load shell-completion and keybindings separately. | ||
If you want to change/disable certain keybindings please check the fzf-documentation. | ||
'') | ||
]; | ||
|
||
options = { | ||
programs.fzf = { | ||
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with fzf"); | ||
keybindings = mkEnableOption (mdDoc "fzf keybindings"); | ||
}; | ||
programs.fzf.enable = mkEnableOption (mdDoc "fuzzy completion with fzf and keybindings"); | ||
}; | ||
config = { | ||
environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) pkgs.fzf; | ||
|
||
programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion '' | ||
source ${pkgs.fzf}/share/fzf/completion.bash | ||
'' + optionalString cfg.keybindings '' | ||
source ${pkgs.fzf}/share/fzf/key-bindings.bash | ||
config = mkIf cfg.enable { | ||
environment.systemPackages = [ pkgs.fzf ]; | ||
|
||
programs.bash.interactiveShellInit = '' | ||
eval "$(${getExe pkgs.fzf} --bash)" | ||
''; | ||
|
||
programs.fish.interactiveShellInit = '' | ||
${getExe pkgs.fzf} --fish | source | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we do this for the others as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it's just the |
||
''; | ||
|
||
programs.zsh.interactiveShellInit = optionalString (!config.programs.zsh.ohMyZsh.enable) | ||
(optionalString cfg.fuzzyCompletion '' | ||
source ${pkgs.fzf}/share/fzf/completion.zsh | ||
'' + optionalString cfg.keybindings '' | ||
source ${pkgs.fzf}/share/fzf/key-bindings.zsh | ||
''); | ||
programs.zsh = { | ||
interactiveShellInit = optionalString (!config.programs.zsh.ohMyZsh.enable) '' | ||
eval "$(${getExe pkgs.fzf} --zsh)" | ||
''; | ||
|
||
programs.zsh.ohMyZsh.plugins = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) [ "fzf" ]; | ||
ohMyZsh.plugins = mkIf (config.programs.zsh.ohMyZsh.enable) [ "fzf" ]; | ||
}; | ||
}; | ||
|
||
meta.maintainers = with maintainers; [ laalsaas ]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if that's ok but the manual seems to build against the current state not the state it was made so I get a build-error of the changelog if the old option is still referenced with #opt here. Alternative would be to remove the link "#opt" and leave it as text.