diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index 53042a98..43400d5a 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -15,7 +15,7 @@ let ./data-model.nix ]; }).config; - nixops4Deployment = import ./deployment.nix { inherit lib inputs; }; + nixops4Deployment = import ./deployment.nix { inherit inputs; }; in { _class = "nix-unit"; @@ -129,24 +129,23 @@ in }; }; environments.single-nixos-vm = - { config, ... }: + { ... }: { _class = "fediversity-environment"; resources.shell.login-shell.username = "operator"; implementation = requests: - { ... }: - # { providers, ... }: + { providers, ... }: { - # _class = "nixops4Deployment"; - # providers = { - # inherit (inputs.nixops4.modules.nixops4Provider) local; - # }; + _class = "nixops4Deployment"; + providers = { + inherit (inputs.nixops4.modules.nixops4Provider) local; + }; resources.the-machine = { _class = "nixops4Resource"; - # type = providers.local.exec; + type = providers.local.exec; imports = [ - inputs.nixops4-nixos.modules.nixops4Resource.nixos + # inputs.nixops4-nixos.modules.nixops4Resource.nixos ]; nixos.module = { ... }: diff --git a/deployment/deployment.nix b/deployment/deployment.nix index a36ecda1..2e7c73dd 100644 --- a/deployment/deployment.nix +++ b/deployment/deployment.nix @@ -1,34 +1,12 @@ { - lib, - # inputs, + inputs, ... }: -# let -# nixops4 = inputs.nixops4.outPath; -# in -# inputs.nixops4.modules.nixops4Deployment.default +inputs.nixops4.modules.nixops4Deployment.default -# import inputs.nixops4.modules.nixops4Deployment.default - -# resources: import inputs.nixops4.modules.nixops4Deployment.default { # inherit lib config resources; # # config = { # # type providers provider inputs outputsSkeleton resourceType # # }; # } - -# { -# imports = [ -# "${nixops4}/nix/deployment/providers.nix" -# "${nixops4}/nix/deployment/resources.nix" -# ]; -# }; - -# "${nixops4}/nix/deployment/resources.nix" - -{ - options.resources = lib.mkOption { - type = lib.types.attrs; - }; -}