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

flake-modules: minor tweaks from #1629 #1634

Merged
merged 5 commits into from
Jun 5, 2024

Conversation

MattSturgeon
Copy link
Member

@MattSturgeon MattSturgeon commented Jun 4, 2024

This PR includes the less controversial commits from #1629, as well as a couple new commits:

  • flake-modules: drop flake-root
  • flake-modules: explicitly set the same nixfmt for treefmt + pre-commit

@MattSturgeon MattSturgeon force-pushed the fmt_cherry_pick branch 2 times, most recently from 2b50942 to 922cd7b Compare June 4, 2024 16:52
@MattSturgeon MattSturgeon requested a review from traxys June 4, 2024 19:14
Copy link
Member

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Perfect !

treefmt isn't actually using flake-root to find the flake's root; it
does it itself.

All we were doing was passing flake-root's default `projectRootFile` to
treefmt, which is `"flake.nix"`;
Remove explicit `formatter = config.treefmt.build.wrapper`, because treefmt's `flakeFormatter` option (default `true`) handles that for us.
@MattSturgeon MattSturgeon merged commit a54ee8a into nix-community:main Jun 5, 2024
@MattSturgeon MattSturgeon deleted the fmt_cherry_pick branch June 5, 2024 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants