From 286f0c245e9616492dcf8d52220dd6bb46f16734 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sat, 19 Jul 2025 18:06:36 +0200 Subject: [PATCH] model: [DUMMY] use mock deployment to temporarily simplify the problem type policy.apply remove `apply`'s optionType, fixes duplicate definition error --- deployment/data-model-test.nix | 15 ++++++++------- deployment/data-model.nix | 2 +- deployment/deployment.nix | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 deployment/deployment.nix diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index 8ff67b1e..53042a98 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -15,7 +15,7 @@ let ./data-model.nix ]; }).config; - nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default; + nixops4Deployment = import ./deployment.nix { inherit lib inputs; }; in { _class = "nix-unit"; @@ -135,15 +135,16 @@ in 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 ]; diff --git a/deployment/data-model.nix b/deployment/data-model.nix index f1156470..2c1a9c80 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -16,7 +16,7 @@ let ; functionType = import ./function.nix; - nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default; + nixops4Deployment = import ./deployment.nix { inherit lib inputs; }; configuration = mkOption { description = "Configuration type declaring options to be set by operators"; diff --git a/deployment/deployment.nix b/deployment/deployment.nix new file mode 100644 index 00000000..a36ecda1 --- /dev/null +++ b/deployment/deployment.nix @@ -0,0 +1,34 @@ +{ + lib, + # inputs, + ... +}: +# let +# nixops4 = inputs.nixops4.outPath; +# in + +# 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; + }; +}