diff --git a/ci.nix b/ci.nix index 650b9c0..a360262 100644 --- a/ci.nix +++ b/ci.nix @@ -4,7 +4,8 @@ let flake = import ./dev; inherit (flake.inputs.nixpkgs) lib; -in { +in +{ inherit (flake) herculesCI; } // { checks = lib.recurseIntoAttrs flake.checks.${builtins.currentSystem}; diff --git a/dev/default.nix b/dev/default.nix index 527ae76..6af149b 100644 --- a/dev/default.nix +++ b/dev/default.nix @@ -9,4 +9,4 @@ let { inherit self; } ./flake-module.nix; in - self.config.flake // { inherit (flake) inputs; } +self.config.flake // { inherit (flake) inputs; } diff --git a/dev/flake-module.nix b/dev/flake-module.nix index 303d39e..c1f8146 100644 --- a/dev/flake-module.nix +++ b/dev/flake-module.nix @@ -20,6 +20,7 @@ flakeModuleArgs@{ config, lib, inputs, ... }: pre-commit = { inherit pkgs; # should make this default to the one it can get via follows settings = { + hooks.nixpkgs-fmt.enable = true; }; }; @@ -43,7 +44,7 @@ flakeModuleArgs@{ config, lib, inputs, ... }: flake = { options.herculesCI = lib.mkOption { type = lib.types.raw; }; config.herculesCI = { - onPush.default.outputs = { + onPush.default.outputs = { inherit (config.flake) packages checks; }; }; diff --git a/lib.nix b/lib.nix index 1ec4fef..8e7f252 100644 --- a/lib.nix +++ b/lib.nix @@ -24,10 +24,10 @@ let options: mkOption { type = types.submoduleWith { - modules = [ { inherit options; } ]; + modules = [{ inherit options; }]; }; }; - + mkPerSystemType = module: types.functionTo (types.submoduleWith { diff --git a/template/multi-module/hello/flake-module.nix b/template/multi-module/hello/flake-module.nix index e0cdbfe..595ece3 100644 --- a/template/multi-module/hello/flake-module.nix +++ b/template/multi-module/hello/flake-module.nix @@ -1,4 +1,3 @@ - # Definitions can be imported from a separate file like this one { self, ... }: { @@ -15,4 +14,4 @@ ]; }; }; -} \ No newline at end of file +}