amarth/services
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hmmm

Browse source
This commit is contained in:
Chris Kruining 2025-09-17 21:02:13 +02:00
parent dfd604f73c
commit 1bb2f3b9b3
Signed by: chris
SSH key fingerprint: SHA256:nG82MUfuVdRVyCKKWqhY+pCrbz9nbX6uzUns4RKa1Pg
8 changed files with 47 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
clanServices/k3s/default.nix
View file

@ -6,7 +6,7 @@ in
_class = "clan.service";
manifest = {
name = "amarth/k3s";
name = "amarth-services/k3s";
description = "K3s service in order to set up a cluster";
categories = [ "System" "Network" "Containers" "Virtualisation" ];
readme = readFile ./README.md;

14
clanServices/k3s/flake-module.nix
View file

@ -1,15 +1,15 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix {};
module = ./default.nix;
in
{
clan.modules.k3s = module;
perSystem = { ... }: {
# clan.nixosTests.k3s = {
# imports = [ ./tests/vm/default.nix ];
clan.nixosTests.k3s = {
imports = [ ./tests/vm/default.nix ];
# clan.modules."@amarth/k3s" = module;
# };
clan.modules."@amarth/k3s" = module;
};
};
}
}

1
clanServices/zitadel/README.md Normal file
View file

@ -0,0 +1 @@
# Zitadel Clan-service

2
clanServices/zitadel/default.nix
View file

@ -6,7 +6,7 @@ in
_class = "clan.service";
manifest = {
name = "amarth/zitadel";
name = "amarth-services/zitadel";
description = "Zitadel service module";
categories = [ "System" "Identity" "IAM" ];
readme = readFile ./README.md;

12
clanServices/zitadel/flake-module.nix
View file

@ -1,15 +1,15 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix {};
module = ./default.nix;
in
{
clan.modules.zitadel = module;
perSystem = { ... }: {
# clan.nixosTests.zitadel = {
# imports = [ ./tests/vm/default.nix ];
clan.nixosTests.zitadel = {
imports = [ ./tests/vm/default.nix ];
# clan.modules."@amarth/zitadel" = module;
# };
clan.modules."@amarth/zitadel" = module;
};
};
}

14
clanServices/zitadel/tests/vm/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
name = "service-k3s";
name = "service-zitadel";
clan = {
directory = ./.;
@ -13,16 +13,16 @@
};
instances = {
k3s = {
zitadel = {
module = {
name = "@amarth/k3s";
name = "@amarth/zitadel";
input = "self";
};
roles.server.machines."node1" = {};
roles.controller.machines."node1" = {};
roles.agent.machines."node2" = {};
roles.agent.machines."node3" = {};
roles.peer.machines."node2" = {};
roles.peer.machines."node3" = {};
};
};
};
@ -37,4 +37,4 @@
start_all()
'';
};
}
}

17
flake.lock generated
View file

@ -201,7 +201,8 @@
"clan-core": "clan-core",
"devshell": "devshell",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_2",
"systems": "systems_2"
}
},
"sops-nix": {
@ -240,6 +241,20 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [

13
flake.nix
View file

@ -21,24 +21,27 @@
};
outputs =
inputs@{ flake-parts, ... }:
inputs@{ flake-parts, systems, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
systems = [
"x86_64-linux"
];
imports = [
flake-parts.flakeModules.modules
inputs.clan-core.flakeModules.default
inputs.devshell.flakeModule
./clanServices/flake-module.nix
];
clan = {
meta.name = "amarth-services";
modules = {
"@amarth/zitadel" = flake-parts.lib.importApply ./clanServices/zitadel/default.nix {};
"@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
};
# modules = {
# "@amarth/zitadel" = flake-parts.lib.importApply ./clanServices/zitadel/default.nix {};
# "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
# };
};
perSystem = { system, ... }: {