From 4a7b9f0f72b4635411ff34d3deb4bfabb2d93923 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Tue, 22 Jul 2025 15:10:24 +0200 Subject: [PATCH] swap out nixops4 from implementation --- deployment/data-model-test.nix | 35 ++++++---------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index 995c2461..753d6adc 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -126,35 +126,12 @@ in { _class = "fediversity-environment"; resources.shell.login-shell.username = "operator"; - implementation = - _requests: - { providers, ... }: - { - _class = "nixops4Deployment"; - providers = { - inherit (inputs.nixops4.modules.nixops4Provider) local; - }; - # this seems checked according to {providers,resources,resource}.nix, - # values will not eagerly get checked, matching `providers.nix`'s `lazyAttrsOf`, - # whereas allowed keys seem to match those defined in `resource.nix`. - # the content of `resources.the-machine` however, follows `nixops4-nixos`, - # which is not allowed through our `type` yet. - resources.the-machine = { - _class = "nixops4Resource"; - type = providers.local.exec; - imports = [ - inputs.nixops4-nixos.modules.nixops4Resource.nixos - ]; - # nixos.module = - # { ... }: - # { - # _class = "nixos"; - # users.users = config.resources.shell.login-shell.apply ( - # lib.filterAttrs (_name: value: value ? login-shell) requests - # ); - # }; - }; - }; + implementation = requests: { + _class = "nixos"; + users.users = config.resources.login-shell.policy.apply ( + lib.filterAttrs (_name: value: value ? login-shell) requests + ); + }; }; }; options = {