refactor: further progress

This commit is contained in:
2026-04-25 00:19:20 +02:00
parent 55fbe82a42
commit 0500aab3cb
31 changed files with 680 additions and 398 deletions
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.actual;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.actual;
in
{
flake.modules.nixos.actual =
@@ -19,7 +19,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
+2 -2
View File
@@ -1,12 +1,12 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
in
{
flake.modules.nixos.caddy = {
services.caddy = {
enable = true;
email = metaRepo.contact.email;
email = repo.contact.email;
openFirewall = true;
};
};
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.gitea;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.gitea;
in
{
flake.modules.nixos.gitea =
@@ -32,7 +32,7 @@ in
services.openssh.settings.AllowUsers = [ "gitea" ];
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
+1 -1
View File
@@ -20,7 +20,7 @@
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
AllowUsers = builtins.attrNames config.meta.host.users;
AllowUsers = builtins.attrNames config.meta.machine.users;
};
};
};
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.radicale;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.radicale;
in
{
flake.modules.nixos.radicale =
@@ -25,7 +25,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.vaultwarden;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.vaultwarden;
in
{
flake.modules.nixos.vaultwarden =
@@ -21,7 +21,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port