diff options
Diffstat (limited to 'modules/flake')
| -rw-r--r-- | modules/flake/configurations.nix | 10 | ||||
| -rw-r--r-- | modules/flake/default.nix | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/modules/flake/configurations.nix b/modules/flake/configurations.nix index ef1ae4e..314e85f 100644 --- a/modules/flake/configurations.nix +++ b/modules/flake/configurations.nix @@ -1,9 +1,7 @@ { config, lib, - withSystem, inputs, - self, ... }: let namespace = "configurations"; @@ -46,8 +44,7 @@ // { modules = args.modules ++ [../../systems/${name} {networking.hostName = name;}]; specialArgs = { - inherit inputs self; - inputs' = withSystem args.system ({inputs', ...}: inputs'); + inherit inputs; secretsDir = ../../secrets/${name}; }; } @@ -70,10 +67,7 @@ ] ++ args.modules; - extraSpecialArgs = { - inherit inputs self; - inputs' = withSystem args.pkgs.system ({inputs', ...}: inputs'); - }; + extraSpecialArgs = {inherit inputs;}; }); mapSystems = type: mapAttrs (name: _: mkSystem type name) cfg.${type}.systems; diff --git a/modules/flake/default.nix b/modules/flake/default.nix index e86bee4..8730f01 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -1,5 +1,6 @@ { flake.flakeModules = { configurations = import ./configurations.nix; + terranix = import ./terranix.nix; }; } |