diff --git a/checks.nix b/checks.nix deleted file mode 100644 index 9505c35..0000000 --- a/checks.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - self, - flake-utils, - nixpkgs, - ... -}: -(flake-utils.lib.eachDefaultSystem ( - system: - let - pkgs = nixpkgs.legacyPackages.${system}; - formatter = self.formatter.${system}; - in - { - checks = { - format = pkgs.runCommand "check-format" { - buildInputs = [ formatter ]; - } "${formatter}/bin/nixpkgs-fmt --check ${./.} && touch $out"; - }; - } -)).checks diff --git a/devshell.nix b/devshell.nix index 1fbad07..3931494 100644 --- a/devshell.nix +++ b/devshell.nix @@ -6,7 +6,6 @@ packages = with pkgs; [ agenix - nixpkgs-fmt nixos-rebuild ]; diff --git a/outputs.nix b/outputs.nix index 08e8ad0..ef7a742 100644 --- a/outputs.nix +++ b/outputs.nix @@ -27,6 +27,10 @@ in import ./devshell.nix { inherit pkgs extraModules; }; + checks = { + formatting = treefmtEval.config.build.check self; + }; + formatter = treefmtEval.config.build.wrapper; packages = import ./pkgs { inherit pkgs; } // { @@ -35,7 +39,6 @@ } )) // { - checks = import ./checks.nix inputs; hmModules = import ./home/modules.nix { lib = nixpkgs.lib; }; hmConfigurations = { dadada = import ./home;