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

resolve rebase

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-19 18:43:28 +02:00
parent cce6a06bf3
commit a6fc12709d
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
default.nix
View file

@ -9,10 +9,9 @@ let
git-hooks git-hooks
gitignore gitignore
; ;
inherit (import sources.flake-inputs) import-flake;
inputs = (import-flake { src = ./.; }).inputs;
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (import sources.flake-inputs) import-flake; inherit (import sources.flake-inputs) import-flake;
inputs = (import-flake { src = ./.; }).inputs;
inherit ((import-flake { src = ./.; }).inputs) nixops4; inherit ((import-flake { src = ./.; }).inputs) nixops4;
panel = import ./panel { inherit sources system; }; panel = import ./panel { inherit sources system; };
pre-commit-check = pre-commit-check =

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

@ -1,7 +1,7 @@
let let
inherit (import ../default.nix { }) pkgs inputs; inherit (import ../default.nix { }) pkgs inputs;
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (lib) mkOption; inherit (lib) mkOption types;
eval = eval =
module: module:
(lib.evalModules { (lib.evalModules {
@ -165,14 +165,14 @@ in
applications.hello.enable = true; applications.hello.enable = true;
}; };
}; };
example-deployment = mkOption {
type = types.submoduleWith {
class = "nixops4Deployment";
modules = [ nixops4Deployment ];
}; };
environments.single-nixos-vm = { readOnly = true;
default = config.environments.single-nixos-vm.deployment config.example-configuration;
}; };
configurations.example = {
enable = true;
applications.hello.enable = true;
# default = config.environments.single-nixos-vm.deployment config.example-configuration;
}; };
} }
); );

21
deployment/data-model.nix
View file

@ -25,6 +25,7 @@ let
); );
}; };
}; };
nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
in in
{ {
_class = "fediversity-settings"; _class = "fediversity-settings";
@ -89,26 +90,6 @@ in
]; ];
}); });
}; };
configuration = mkOption {
description = "Configuration type declaring options to be set by operators";
type = optionType;
readOnly = true;
default = submodule {
options = {
enable = lib.mkEnableOption {
description = "your Fediversity configuration";
};
applications = lib.mapAttrs (
_name: application:
mkOption {
description = application.description;
type = submodule application.module;
default = { };
}
) config.applications;
};
};
};
environments = mkOption { environments = mkOption {
description = "Run-time environments for Fediversity applications to be deployed to"; description = "Run-time environments for Fediversity applications to be deployed to";
type = attrsOf (submoduleWith { type = attrsOf (submoduleWith {