refactor: simplify module composition

This commit is contained in:
2026-04-22 02:35:26 +02:00
parent 3b6c42ebe3
commit 5eec5689f4
25 changed files with 615 additions and 448 deletions
+7 -4
View File
@@ -1,6 +1,7 @@
{ config, ... }:
let
metaLib = config.meta.lib;
service = metaLib.repo.services.actual;
in
{
flake.modules.nixos.actual =
@@ -11,15 +12,17 @@ in
enable = true;
openFirewall = false;
settings = {
port = 3000;
hostname = "127.0.0.1";
inherit (service) port;
hostname = service.host;
};
};
}
(metaLib.mkCaddyReverseProxy {
domain = "finance.jelles.net";
port = 3000;
inherit (service)
domain
port
;
})
];
}
+5 -1
View File
@@ -1,8 +1,12 @@
{ config, ... }:
let
metaLib = config.meta.lib;
in
{
flake.modules.nixos.caddy = {
services.caddy = {
enable = true;
email = "mail@jelles.net";
email = metaLib.repo.contact.email;
openFirewall = true;
};
};
-18
View File
@@ -1,18 +0,0 @@
{
flake.modules.nixos.deluge-service =
{ ... }:
{
sops.secrets.deluge-auth-file = { };
services.deluge = {
enable = true;
declarative = false;
};
};
flake.modules.homeManager.deluge-client =
{ pkgs, ... }:
{
home.packages = [ pkgs.deluge ];
};
}
+9 -6
View File
@@ -1,6 +1,7 @@
{ config, ... }:
let
metaLib = config.meta.lib;
service = metaLib.repo.services.gitea;
in
{
flake.modules.nixos.gitea =
@@ -12,10 +13,10 @@ in
settings = {
server = {
DOMAIN = "git.jelles.net";
ROOT_URL = "https://git.jelles.net/";
HTTP_PORT = 3001;
HTTP_ADDR = "127.0.0.1";
DOMAIN = service.domain;
ROOT_URL = service.url;
HTTP_PORT = service.port;
HTTP_ADDR = service.host;
START_SSH_SERVER = false;
SSH_PORT = 22;
@@ -31,8 +32,10 @@ in
}
(metaLib.mkCaddyReverseProxy {
domain = "git.jelles.net";
port = 3001;
inherit (service)
domain
port
;
})
];
}
-11
View File
@@ -1,11 +0,0 @@
{ ... }:
{
flake.modules.nixos.qbittorrent = {
services.qbittorrent = {
enable = true;
openFirewall = true;
torrentingPort = 43864;
webuiPort = 8123;
};
};
}
+6 -3
View File
@@ -1,6 +1,7 @@
{ config, ... }:
let
metaLib = config.meta.lib;
service = metaLib.repo.services.radicale;
in
{
flake.modules.nixos.radicale =
@@ -10,7 +11,7 @@ in
services.radicale = {
enable = true;
settings = {
server.hosts = [ "127.0.0.1:5232" ];
server.hosts = [ "${service.host}:${toString service.port}" ];
auth = {
type = "htpasswd";
@@ -24,8 +25,10 @@ in
}
(metaLib.mkCaddyReverseProxy {
domain = "radicale.jelles.net";
port = 5232;
inherit (service)
domain
port
;
extraHeaders = [
{
name = "X-Script-Name";
+7 -4
View File
@@ -1,6 +1,7 @@
{ config, ... }:
let
metaLib = config.meta.lib;
service = metaLib.repo.services.vaultwarden;
in
{
flake.modules.nixos.vaultwarden =
@@ -11,17 +12,19 @@ in
enable = true;
backupDir = "/var/backup/vaultwarden";
config = {
DOMAIN = "https://vault.jelles.net";
DOMAIN = service.url;
SIGNUPS_ALLOWED = false;
ROCKET_PORT = 8100;
ROCKET_PORT = service.port;
ROCKET_LOG = "critical";
};
};
}
(metaLib.mkCaddyReverseProxy {
domain = "vault.jelles.net";
port = 8100;
inherit (service)
domain
port
;
})
];
}