Skip to content
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

nixos/fzf: add package option, fix ordering, and other cleanup #303201

Closed
wants to merge 5 commits into from

Conversation

eclairevoyant
Copy link
Contributor

@eclairevoyant eclairevoyant commented Apr 10, 2024

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@eclairevoyant eclairevoyant marked this pull request as ready for review April 10, 2024 20:47
@eclairevoyant eclairevoyant changed the title [WIP] nixos/fzf: nixos/fzf: add package option, fix ordering, and other cleanup Apr 10, 2024
@SebTM
Copy link
Contributor

SebTM commented Apr 10, 2024

Thanks for the contribution - as yours super-seeds mine can you please add the mkAfter for all interactiveShellInit as it would override otherwise?

@SebTM
Copy link
Contributor

SebTM commented Apr 10, 2024

If possible otherwise I can do a follow-up otherwise:

could you please add #303145 and what I proposed here? #298692 (comment)

Comment on lines 4 to 8
inherit (lib) maintainers;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkRemovedOptionModule;
inherit (lib.options) mkEnableOption;
inherit (lib.strings) optionalString;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please take the functions from lib. Where they are exactly is an implementation detail and just complicates things here.

Also we would avoid maintaining this list of functions by just prefixing the functions with lib.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where they are exactly is an implementation detail

Being explicit is always better. And as we know there are many functions not even exposed at the top level or have the same name in multiple scopes.

@eclairevoyant
Copy link
Contributor Author

Thanks for the contribution - as yours super-seeds mine can you please add the mkAfter for all interactiveShellInit as it would override otherwise?

I don't know how fish works, do you have some example for this?

could you please add #303145 and what I proposed here? #298692 (comment)

Not sure what is being asked, actually.

@SebTM
Copy link
Contributor

SebTM commented Apr 10, 2024

I don't know how fish works, do you have some example for this?

Never-mind, didn't saw the change to the bash-option and it already orders correct for zsh and might for fish not fully sure on that

Copy link
Contributor

@SebTM SebTM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about the formatting discussion if there are guidelines for/against this particular case - but overall LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

programs.fzf.enable breaks some bash completions
4 participants