switch formatting to nixpkgs-fmt

This commit is contained in:
Bryton Hall 2023-07-07 22:01:34 -04:00
parent 3598716c73
commit 2712e89716
65 changed files with 4839 additions and 5222 deletions

View file

@ -1,10 +1,4 @@
{
name,
config,
lib,
kubenix,
...
}:
{ name, config, lib, kubenix, ... }:
with lib; let
inherit (config.submodules.instances) instance1;
inherit (config.submodules.instances) instance2;
@ -13,8 +7,8 @@ with lib; let
inherit (config.submodules.instances) instance5;
inherit (config.submodules.instances) versioned-submodule;
submodule = {...}: {
imports = [kubenix.modules.submodule];
submodule = { ... }: {
imports = [ kubenix.modules.submodule ];
options.submodule.args = {
value = mkOption {
@ -28,8 +22,9 @@ with lib; let
};
};
};
in {
imports = with kubenix.modules; [test submodules];
in
{
imports = with kubenix.modules; [ test submodules ];
test = {
name = "submodules-defaults";
@ -80,7 +75,7 @@ in {
{
submodule = {
name = "submodule1";
tags = ["tag1"];
tags = [ "tag1" ];
};
}
];
@ -91,7 +86,7 @@ in {
{
submodule = {
name = "submodule2";
tags = ["tag2"];
tags = [ "tag2" ];
};
}
];
@ -102,7 +97,7 @@ in {
{
submodule = {
name = "submodule3";
tags = ["tag2"];
tags = [ "tag2" ];
};
}
];
@ -146,11 +141,11 @@ in {
default.submodule.args.defaultValue = mkDefault "value";
}
{
tags = ["tag1"];
tags = [ "tag1" ];
default.submodule.args.value = mkDefault "value1";
}
{
tags = ["tag2"];
tags = [ "tag2" ];
default.submodule.args.value = mkDefault "value2";
}
{
@ -158,7 +153,7 @@ in {
default.submodule.args.value = mkDefault "value4";
}
{
default = {config, ...}: {
default = { config, ... }: {
submodule.args.defaultValue = mkIf (config.submodule.args.value == "custom-value") "my-custom-value";
};
}

View file

@ -1,14 +1,7 @@
{
name,
config,
lib,
kubenix,
subm-lib,
...
}:
{ name, config, lib, kubenix, subm-lib, ... }:
with lib; let
submodule = {
imports = [kubenix.modules.submodule];
imports = [ kubenix.modules.submodule ];
config.submodule = {
name = "subm";
@ -17,8 +10,9 @@ with lib; let
};
};
};
in {
imports = with kubenix.modules; [test submodules];
in
{
imports = with kubenix.modules; [ test submodules ];
test = {
name = "submodules-exports";
@ -33,7 +27,7 @@ in {
submodules.imports = [
{
modules = [submodule];
modules = [ submodule ];
exportAs = "subm-lib";
}
];

View file

@ -1,27 +1,22 @@
{
name,
config,
lib,
kubenix,
...
}:
{ name, config, lib, kubenix, ... }:
with lib; let
submodule = {name, ...}: {
imports = [kubenix.modules.submodule];
submodule = { name, ... }: {
imports = [ kubenix.modules.submodule ];
config.submodule = {
name = "subm";
passthru.global.${name} = "true";
};
};
in {
imports = with kubenix.modules; [test submodules];
in
{
imports = with kubenix.modules; [ test submodules ];
options = {
global = mkOption {
description = "Global value";
type = types.attrs;
default = {};
default = { };
};
};
@ -45,11 +40,9 @@ in {
];
};
submodules.imports = [
{
modules = [submodule];
}
];
submodules.imports = [{
modules = [ submodule ];
}];
submodules.instances.inst1 = {
submodule = "subm";

View file

@ -1,15 +1,10 @@
{
name,
config,
lib,
kubenix,
...
}:
{ name, config, lib, kubenix, ... }:
with lib; let
cfg = config.submodules.instances.instance;
inherit (cfg.config.submodule) args;
in {
imports = with kubenix.modules; [test submodules];
in
{
imports = with kubenix.modules; [ test submodules ];
test = {
name = "submodules-simple";
@ -45,8 +40,8 @@ in {
submodules.propagate.enable = true;
submodules.imports = [
{
module = {submodule, ...}: {
imports = [kubenix.modules.submodule];
module = { submodule, ... }: {
imports = [ kubenix.modules.submodule ];
options.submodule.args = {
name = mkOption {
@ -62,7 +57,7 @@ in {
config = {
submodule.name = "submodule";
submodule.tags = ["tag"];
submodule.tags = [ "tag" ];
};
};
}

View file

@ -1,17 +1,11 @@
{
name,
config,
lib,
kubenix,
...
}:
{ name, config, lib, kubenix, ... }:
with lib; let
inst-exact = config.submodules.instances.inst-exact.config;
inst-regex = config.submodules.instances.inst-regex.config;
inst-latest = config.submodules.instances.inst-latest.config;
submodule = {
imports = [kubenix.modules.submodule];
imports = [ kubenix.modules.submodule ];
options.version = mkOption {
type = types.str;
@ -20,8 +14,9 @@ with lib; let
config.submodule.name = "subm";
};
in {
imports = with kubenix.modules; [test submodules];
in
{
imports = with kubenix.modules; [ test submodules ];
test = {
name = "submodules-versioning";