rename specialArgs -> args
This commit is contained in:
parent
ce996f9956
commit
af1da3dbc3
3 changed files with 12 additions and 15 deletions
|
|
@ -52,7 +52,7 @@
|
||||||
in {
|
in {
|
||||||
base = null;
|
base = null;
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
specialArgs = Terminal {};
|
args = Terminal {};
|
||||||
|
|
||||||
groups = Terminal {};
|
groups = Terminal {};
|
||||||
nodes = Terminal {};
|
nodes = Terminal {};
|
||||||
|
|
@ -189,19 +189,16 @@ in {
|
||||||
node,
|
node,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
nixosDecl = lib.nixosSystem {
|
nixosDecl = lib.nixosSystem rec {
|
||||||
system = node.system;
|
system = node.system;
|
||||||
specialArgs = let
|
|
||||||
specialArgs =
|
specialArgs =
|
||||||
nexus.specialArgs
|
nexus.args
|
||||||
// node.specialArgs
|
// node.args
|
||||||
// {
|
// {
|
||||||
inherit root specialArgs;
|
inherit root specialArgs;
|
||||||
inherit (node) system;
|
inherit (node) system;
|
||||||
_deploy-rs = inputs.deploy-rs;
|
_deploy-rs = inputs.deploy-rs;
|
||||||
};
|
};
|
||||||
in
|
|
||||||
specialArgs;
|
|
||||||
modules =
|
modules =
|
||||||
[
|
[
|
||||||
self.nixosModules.default
|
self.nixosModules.default
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ in rec {
|
||||||
system = missing "its system architecture" "system";
|
system = missing "its system architecture" "system";
|
||||||
groups = [];
|
groups = [];
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
specialArgs = Terminal {};
|
args = Terminal {};
|
||||||
|
|
||||||
base = null;
|
base = null;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
extraModules = mkOption {
|
extraModules = mkOption {
|
||||||
type = types.listOf types.path;
|
type = types.listOf types.path;
|
||||||
};
|
};
|
||||||
specialArgs = mkOption {
|
args = mkOption {
|
||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue