Skip to content

Commit

Permalink
fix more formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
maxheld83 committed Feb 21, 2025
1 parent 9426051 commit d67fa9d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 31 deletions.
52 changes: 26 additions & 26 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@
flake-utils,
format,
...
}:
let
systemOutputs = flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system};
in {
formatting = format.checks.${system}.formatting;
devShells.default = pkgs.mkShell {
packages = [
# keep-sorted start
flake-checker.packages.${system}.default
flake-iter.packages.${system}.default
format.formatter.${system}
fh.packages.${system}.default
pkgs.git
pkgs.gnumake
pkgs.nixd
# keep-sorted end
];
};
formatter = format.formatter.${system};
}
);
universalOutputs = {
schemas = flake-schemas.schemas;
};
in
}: let
systemOutputs = flake-utils.lib.eachDefaultSystem (
system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
formatting = format.checks.${system}.formatting;
devShells.default = pkgs.mkShell {
packages = [
# keep-sorted start
fh.packages.${system}.default
flake-checker.packages.${system}.default
flake-iter.packages.${system}.default
format.formatter.${system}
pkgs.git
pkgs.gnumake
pkgs.nixd
# keep-sorted end
];
};
formatter = format.formatter.${system};
}
);
universalOutputs = {
schemas = flake-schemas.schemas;
};
in
systemOutputs // universalOutputs;
}
11 changes: 6 additions & 5 deletions format/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
# keep-sorted start
treefmt-nix.url = "github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204";
flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/0.1.*";
treefmt-nix.url = "github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204";
# keep-sorted end
};

outputs = {
nixpkgs,
flake-utils,
treefmt-nix,
self
}:
flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system};
self,
}:
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = nixpkgs.legacyPackages.${system};
in rec {
treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
formatter = treefmtEval.config.build.wrapper;
Expand Down

0 comments on commit d67fa9d

Please sign in to comment.