Skip to content

Commit cd159ad

Browse files
committed
fix pre-commit-hooks
1 parent b3afcc6 commit cd159ad

3 files changed

Lines changed: 23 additions & 15 deletions

File tree

nix/checks.nix

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ inputs.nixpkgs.legacyPackages
1111
{
1212
formatting = treefmtEval.config.build.check ../.;
1313

14-
# NOTE: run `nix develop` to update hooks
15-
pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
16-
src = ../.;
17-
hooks = {
18-
treefmt = {
19-
enable = true;
20-
package = inputs.self.formatter.${system};
21-
};
22-
# convco.enable = false;
23-
};
24-
};
14+
pre-commit-check = import ./pre-commit-hooks.nix { inherit inputs system; };
2515
}
2616
)

nix/pre-commit-hooks.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
inputs,
3+
system,
4+
}:
5+
inputs.pre-commit-hooks.lib.${system}.run {
6+
src = ../.;
7+
hooks = {
8+
treefmt = {
9+
enable = true;
10+
package = inputs.self.formatter.${system};
11+
};
12+
# convco.enable = false;
13+
};
14+
}

nix/shell.nix

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22
inputs.nixpkgs.legacyPackages
33
|> inputs.nixpkgs.lib.getAttrs (import ./systems.nix).all
44
|> builtins.mapAttrs (
5-
_system: pkgs: {
5+
system: pkgs:
6+
let
7+
preCommitCheck = import ./pre-commit-hooks.nix { inherit inputs system; };
8+
in
9+
{
610
default = pkgs.mkShell {
711
name = "nix-config";
812
packages = [
913
pkgs.convco
1014
pkgs.nixfmt
1115
pkgs.deadnix
1216
pkgs.statix
13-
];
14-
15-
# buildInputs = checks.pre-commit-check.enabledPackages;
17+
]
18+
++ preCommitCheck.enabledPackages;
1619

1720
shellHook =
1821
let
@@ -27,6 +30,7 @@ inputs.nixpkgs.legacyPackages
2730
};
2831
in
2932
''
33+
${preCommitCheck.shellHook}
3034
${cowWarn}/bin/cowWarn
3135
'';
3236
};

0 commit comments

Comments
 (0)