Skip to content

nix: cargo-sort improvements #33

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.

Sign up for GitHub

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

Open
nothingmuch wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −13
Open

nix: cargo-sort improvements #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nix/devshell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
packages = with pkgs; [
cargo-llvm-cov
cargo-nextest
cargo-sort
config.packages.scrub-commit-history
config.treefmt.build.wrapper
just
Expand Down
36 changes: 23 additions & 13 deletions nix/treefmt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,30 @@
{
imports = [ inputs.treefmt-nix.flakeModule ];

perSystem = {
treefmt = {
projectRootFile = "flake.nix";
perSystem =
{ pkgs, config, ... }:
{
formatter = pkgs.writeShellScriptBin "fmt" ''
${pkgs.cargo-sort}/bin/cargo-sort --workspace
exec ${config.treefmt.build.wrapper}/bin/treefmt "$@"
'';

programs.nixfmt.enable = true;
programs.rustfmt.enable = true;
programs.shellcheck.enable = true;
programs.shfmt.enable = true;
programs.just.enable = true;
programs.mdformat.enable = true;
programs.taplo.enable = true;
programs.yamlfmt.enable = true;
treefmt = {
projectRootFile = "flake.nix";

settings.global.excludes = [ ".envrc" ];
programs.nixfmt.enable = true;
programs.rustfmt.enable = true;
programs.shellcheck.enable = true;
programs.shfmt.enable = true;
programs.just.enable = true;
programs.mdformat.enable = true;
programs.taplo = {
enable = true;
settings.formatting.reorder_keys = false; # already the default, but making it explicit because true would interfere with cargo-sort
};
programs.yamlfmt.enable = true;

settings.global.excludes = [ ".envrc" ];
};
};
};
}
Loading