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

swap out dummy module for actual import

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-20 18:23:32 +02:00
parent f76485819d
commit 4ab39cc1b6
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
# );
# };
};
};
};

24
deployment/deployment.nix
View file

@ -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;
# };
# }