diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index e8035139..29933c96 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -126,34 +126,32 @@ 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 = - { ... }: - { - _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) { } - ); - }; + # nixos.module = + # { ... }: + # { + # _class = "nixos"; + # users.users = config.resources.shell.login-shell.apply ( + # lib.filterAttrs (_name: value: value ? login-shell) requests + # ); + # }; }; }; }; diff --git a/deployment/deployment.nix b/deployment/deployment.nix index a36ecda1..6419ce04 100644 --- a/deployment/deployment.nix +++ b/deployment/deployment.nix @@ -1,13 +1,12 @@ { - lib, - # inputs, + inputs, ... }: -# let -# nixops4 = inputs.nixops4.outPath; -# in +let + nixops4 = inputs.nixops4.outPath; +in -# inputs.nixops4.modules.nixops4Deployment.default +inputs.nixops4.modules.nixops4Deployment.default # import inputs.nixops4.modules.nixops4Deployment.default @@ -23,12 +22,13 @@ # "${nixops4}/nix/deployment/providers.nix" # "${nixops4}/nix/deployment/resources.nix" # ]; -# }; +# } # "${nixops4}/nix/deployment/resources.nix" -{ - options.resources = lib.mkOption { - type = lib.types.attrs; - }; -} +# # goes thru cuz it doesn't actually check much +# { +# options.resources = lib.mkOption { +# type = lib.types.attrs; +# }; +# }