treefmt v2.5.0traversed 723 files emitted 499 files for processing formatted 499 files (2 changed) in 3.003s M hosts/mali/opencloud-home.nix M tests/opencloud-eval.nix diff --git a/hosts/mali/opencloud-home.nix b/hosts/mali/opencloud-home.nix index 0fdcbc7..72fd044 100644 --- a/hosts/mali/opencloud-home.nix +++ b/hosts/mali/opencloud-home.nix @@ -11,20 +11,18 @@ in { options.modules.services.opencloud.maliStorage = lib.mkOption { type = lib.types.nullOr ( - lib.types.submodule ( - _: { - options = { - dataset = lib.mkOption { - type = lib.types.str; - description = "ZFS dataset containing this OpenCloud instance's data."; - }; - dataDir = lib.mkOption { - type = lib.types.str; - description = "Mountpoint for this OpenCloud instance's data dataset."; - }; + lib.types.submodule (_: { + options = { + dataset = lib.mkOption { + type = lib.types.str; + description = "ZFS dataset containing this OpenCloud instance's data."; }; - } - ) + dataDir = lib.mkOption { + type = lib.types.str; + description = "Mountpoint for this OpenCloud instance's data dataset."; + }; + }; + }) ); default = null; description = "Mali storage and NFS export for one OpenCloud instance."; diff --git a/tests/opencloud-eval.nix b/tests/opencloud-eval.nix index c99b9f3..93a3df6 100644 --- a/tests/opencloud-eval.nix +++ b/tests/opencloud-eval.nix @@ -58,9 +58,7 @@ assert c.users.users.opencloud-beta.uid == 3102; assert c.users.users.opencloud-alpha.linger; assert c.virtualisation.quadlet.containers.opencloud-alpha.uid == 3101; assert c.virtualisation.quadlet.containers.opencloud-beta.uid == 3102; -assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" ( - c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment -); +assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment; assert builtins.elem "opencloud-alpha-office.service" ( c.virtualisation.quadlet.containers.opencloud-alpha.unitConfig.Requires or [ ] );