kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

swap out dummy module for actual import

Browse source 
clean deployment module a bit

simplify imports
This commit is contained in:
Kiara Grouwstra 2025-07-20 18:23:32 +02:00
parent 4d9cdf923d
commit 8a06661949
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 19 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
deployment/data-model-test.nix
View file

@ -15,7 +15,7 @@ let
./data-model.nix ./data-model.nix
]; ];
}).config; }).config;
nixops4Deployment = import ./deployment.nix { inherit lib inputs; }; nixops4Deployment = import ./deployment.nix { inherit inputs; };
in in
{ {
test-eval = { test-eval = {
@ -125,34 +125,32 @@ in
}; };
}; };
environments.single-nixos-vm = environments.single-nixos-vm =
{ config, ... }: { ... }:
{ {
_class = "fediversity-environment"; _class = "fediversity-environment";
resources.shell.login-shell.username = "operator"; resources.shell.login-shell.username = "operator";
implementation = implementation =
_requests: _requests:
{ ... }: { providers, ... }:
# { providers, ... }:
{ {
# _class = "nixops4Deployment"; _class = "nixops4Deployment";
# providers = { providers = {
# inherit (inputs.nixops4.modules.nixops4Provider) local; inherit (inputs.nixops4.modules.nixops4Provider) local;
# }; };
resources.the-machine = { resources.the-machine = {
_class = "nixops4Resource"; _class = "nixops4Resource";
# type = providers.local.exec; type = providers.local.exec;
imports = [ imports = [
inputs.nixops4-nixos.modules.nixops4Resource.nixos # inputs.nixops4-nixos.modules.nixops4Resource.nixos
]; ];
nixos.module = # nixos.module =
{ ... }: # { ... }:
{ # {
_class = "nixos"; # _class = "nixos";
users.users = config.resources.shell.login-shell.apply ( # 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) { } # );
); # };
};
}; };
}; };
}; };

26
deployment/deployment.nix
View file

@ -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; # inherit lib config resources;
# # config = { # # config = {
# # type providers provider inputs outputsSkeleton resourceType # # 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;
};
}