fix(dotfiles): centralize fix app ignores

This commit is contained in:
2026-09-16 23:14:31 -04:00
parent 885124c240
commit edf9fdd2b8
4 changed files with 24 additions and 7 deletions

View File

@@ -3,9 +3,17 @@
lib,
formatter,
system,
ignore,
}:
let
deadnixExcludeArgs = lib.concatStringsSep " " ([ "--exclude" ] ++ ignore);
pkgs = inputs.nixpkgs.legacyPackages.${system};
statixIgnoreArgs = lib.escapeShellArgs (
lib.concatMap (path: [
"--ignore"
(if path == "third_party" then "${path}/**" else path)
]) ignore
);
in
{
fix = {
@@ -20,8 +28,8 @@ in
];
text = ''
treefmt
statix fix .
deadnix --edit --exclude configs/nixos/hosts/*/hardware-configuration.nix -- .
statix fix ${statixIgnoreArgs} .
deadnix --edit ${deadnixExcludeArgs} -- .
treefmt
'';
}

View File

@@ -6,6 +6,8 @@
system,
}:
let
ignore = import ./ignore.nix;
util = import ./util.nix { inherit lib; };
registry = import ./registry.nix {
@@ -43,7 +45,7 @@ in
{
formatter.${system} =
(import ./formatter.nix {
inherit inputs system;
inherit inputs system ignore;
}).config.build.wrapper;
apps.${system} = import ./apps.nix {
@@ -51,6 +53,7 @@ in
inputs
lib
system
ignore
;
formatter = self.formatter.${system};
};

View File

@@ -1,10 +1,12 @@
{ inputs, system }:
{
inputs,
system,
ignore,
}:
inputs.treefmt-nix.lib.evalModule inputs.nixpkgs.legacyPackages.${system} {
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
settings.formatter.nixfmt.excludes = [
"configs/nixos/hosts/*/hardware-configuration.nix"
];
settings.excludes = map (path: if path == "third_party" then "${path}/**" else path) ignore;
}

4
src/dotfiles/ignore.nix Normal file
View File

@@ -0,0 +1,4 @@
[
"third_party"
"configs/nixos/hosts/*/hardware-configuration.nix"
]