From a8e56f0456268509671d9f7aac0e4a733c03af9b 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 --- deployment/data-model-test.nix | 20 +++++++++++--------- deployment/data-model.nix | 2 +- deployment/deployment.nix | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 deployment/deployment.nix diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index e831e21d..541abed5 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 { test-eval = { @@ -131,16 +131,17 @@ in _class = "fediversity-environment"; resources.shell.login-shell.username = "operator"; implementation = - requests: - { providers, ... }: + _requests: + { ... }: + # { 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 ]; @@ -149,7 +150,8 @@ in { _class = "nixos"; users.users = config.resources.shell.login-shell.apply ( - lib.filterAttrs (_name: value: value ? login-shell) requests + # lib.filterAttrs (_name: value: value ? login-shell) requests + lib.filterAttrs (_name: value: value ? login-shell) { } ); }; }; diff --git a/deployment/data-model.nix b/deployment/data-model.nix index dc4434bf..d31c4efa 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -25,7 +25,7 @@ let ); }; }; - nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default; + nixops4Deployment = import ./deployment.nix { inherit lib inputs; }; in { _class = "fediversity-settings"; 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; + }; +}