Compare commits

..

No commits in common. "ba7b722d33e28b8c843dc7777a25afa7fb740f2b" and "4bb34b4ccde91a831f8382ef5655ad192cb563b5" have entirely different histories.

13 changed files with 150 additions and 57 deletions

View file

@ -0,0 +1,34 @@
{ instancesFunctions }:
let
inherit (instancesFunctions)
domain0
servicePath
sslPath
sopsPath
;
kanboardLabel = "Kanboard";
kanboardName = "kanboard";
kanboardSubdomain = "todo";
in
{
label = kanboardLabel;
name = kanboardName;
email = {
address0 = "noreply@${domain0}";
};
sops = {
path0 = "${sopsPath}/${kanboardName}";
};
subdomain = kanboardSubdomain;
paths = {
path0 = "${servicePath}/${kanboardLabel}";
};
ports = {
port0 = 3434;
};
ssl = {
cert = "${sslPath}/${kanboardSubdomain}.${domain0}/fullchain.pem";
key = "${sslPath}/${kanboardSubdomain}.${domain0}/key.pem";
};
}

View file

@ -1,7 +1,7 @@
{ instancesFunctions }: { instancesFunctions }:
let let
inherit (instancesFunctions) inherit (instancesFunctions)
domain0 domain1
servicePath servicePath
sslPath sslPath
sopsPath sopsPath
@ -13,9 +13,6 @@ in
{ {
label = nextcloudLabel; label = nextcloudLabel;
name = nextcloudName; name = nextcloudName;
email = {
address0 = "noreply@${nextcloudName}.${domain0}";
};
sops = { sops = {
path0 = "${sopsPath}/${nextcloudName}"; path0 = "${sopsPath}/${nextcloudName}";
}; };
@ -27,7 +24,7 @@ in
port0 = 8354; # Nextcloud port0 = 8354; # Nextcloud
}; };
ssl = { ssl = {
cert = "${sslPath}/${nextcloudName}.${domain0}/fullchain.pem"; cert = "${sslPath}/${nextcloudName}.${domain1}/fullchain.pem";
key = "${sslPath}/${nextcloudName}.${domain0}/key.pem"; key = "${sslPath}/${nextcloudName}.${domain1}/key.pem";
}; };
} }

View file

@ -1,19 +0,0 @@
{ instancesFunctions }:
let
inherit (instancesFunctions)
sopsPath
;
nginxLabel = "Nginx";
nginxName = "nginx";
in
{
label = nginxLabel;
name = nginxName;
sops = {
path0 = "${sopsPath}/${nginxName}";
};
ports = {
port0 = 8080;
};
}

View file

@ -89,7 +89,7 @@ in
vaultwarden vaultwarden
forgejo forgejo
xserver xserver
nextcloud # kanboard
; ;
}; };
}; };

View file

@ -35,10 +35,10 @@ in
"jellyfin" "jellyfin"
"minecraft" "minecraft"
"ollama" "ollama"
"nextcloud"
"syncthing" "syncthing"
"searx" "searx"
"vaultwarden" "vaultwarden"
"kanboard"
"audiobookshelf" "audiobookshelf"
] ]
) )

View file

@ -2,7 +2,7 @@
let let
widgetsPath = ./widgets; widgetsPath = ./widgets;
widgets = { widgets = {
jellyfin = import (widgetsPath + /jelly) { inherit config flake; }; jellyfin = import (widgetsPath + /jellyfin) { inherit config flake; };
steam = import (widgetsPath + /steam); steam = import (widgetsPath + /steam);
podcasts = import (widgetsPath + /podcasts.nix); podcasts = import (widgetsPath + /podcasts.nix);
calendar = import (widgetsPath + /calendar.nix); calendar = import (widgetsPath + /calendar.nix);

3
modules/nixos/services/jellyfin/default.nix Executable file → Normal file
View file

@ -1,5 +1,6 @@
{ flake, ... }: { config, ... }:
let let
flake = config.flake;
inherit (flake.config.people) user0; inherit (flake.config.people) user0;
inherit (flake.config.machines.devices) ceres; inherit (flake.config.machines.devices) ceres;
inherit (flake.config.services.instances) jellyfin web; inherit (flake.config.services.instances) jellyfin web;

View file

@ -0,0 +1,93 @@
{
flake,
config,
...
}:
let
inherit (flake.config.machines.devices)
ceres
;
inherit (flake.config.services.instances) smtp kanboard web;
service = kanboard;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url0}";
in
{
services = {
kanboard = {
enable = true;
dataDir = "/var/lib/${service.name}";
settings = {
HTTP_PROXY_HOSTNAME = host;
HTTP_PROXY_PORT = service.ports.port0;
MAIL_SMTP_HOSTNAME = smtp.hostname;
MAIL_TRANSPORT = "smtp";
MAIL_SMTP_PORT = smtp.ports.port0;
MAIL_SMTP_USERNAME = service.email.address0;
MAIL_FROM = service.email.address0;
MAIL_SMTP_PASSWORD = config.sops.secrets."${service.name}-smtp".path;
MAIL_SMTP_ENCRYPTION = "tls";
};
};
caddy = {
virtualHosts = {
"${host}" = {
extraConfig = ''
reverse_proxy ${localhost}:${toString service.ports.port0}
tls ${service.ssl.cert} ${service.ssl.key}
'';
};
};
};
};
sops =
let
sopsPath = secret: {
path = "${service.sops.path0}/${service.name}-${secret}";
owner = service.name;
mode = "600";
};
in
{
secrets = builtins.listToAttrs (
map
(secret: {
name = "${service.name}-${secret}";
value = sopsPath secret;
})
[
"smtp"
]
);
};
fileSystems."/var/lib/${service.name}" = {
device = service.paths.path0;
fsType = "none";
options = [
"bind"
];
depends = [
ceres.storage0.mount
];
};
systemd.tmpfiles.rules = [
"Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
"Z ${service.sops.path0} 755 ${service.name} ${service.name} -"
];
users.users.${service.name}.extraGroups = [
"caddy"
"postgres"
];
networking = {
firewall = {
allowedTCPPorts = [
service.ports.port0
];
};
};
}

View file

@ -4,8 +4,12 @@
... ...
}: }:
let let
inherit (flake.config.machines.devices) ceres; inherit (flake.config.machines.devices)
inherit (flake.config.services.instances) minecraft; ceres
;
inherit (flake.config.services.instances)
minecraft
;
service = minecraft; service = minecraft;
in in
{ {

View file

@ -8,15 +8,10 @@ let
inherit (flake.config.people) user0; inherit (flake.config.people) user0;
inherit (flake.config.people.users.${user0}) name; inherit (flake.config.people.users.${user0}) name;
inherit (flake.config.machines.devices) ceres; inherit (flake.config.machines.devices) ceres;
inherit (flake.config.services.instances) inherit (flake.config.services.instances) nextcloud nginx web;
nextcloud
nginx
smtp
web
;
service = nextcloud; service = nextcloud;
localhost = web.localhost.address0; localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url0}"; host = "${service.subdomain}.${web.domains.url1}";
in in
{ {
services = { services = {
@ -27,14 +22,13 @@ in
enable = true; enable = true;
hostName = host; hostName = host;
https = true; https = true;
package = pkgs.nextcloud31; package = pkgs.nextcloud30;
phpOptions."opcache.interned_strings_buffer" = "24"; phpOptions."opcache.interned_strings_buffer" = "24";
extraAppsEnable = true; extraAppsEnable = true;
extraApps = { extraApps = {
inherit (pkgs.nextcloud31Packages.apps) inherit (config.services.service.package.packages.apps)
contacts contacts
calendar calendar
deck
; ;
}; };
config = { config = {
@ -48,17 +42,8 @@ in
settings = { settings = {
default_phone_region = "CA"; default_phone_region = "CA";
log_type = "file"; log_type = "file";
mail_domain = host; mail_sendmailmode = "pipe";
mail_from_address = "noreply"; mail_smtpmode = "sendmail";
mail_sendmailmode = "smtp";
mail_smtpmode = "smtp";
mail_smtphost = smtp.hostname;
mail_smtpport = smtp.ports.port0;
mail_smtpsecure = "";
mail_smtptimeout = 30;
mail_smtpauth = 1;
mail_smtpname = service.email.address0;
mail_smtppassword = config.sops.secrets."${service.name}-smtp".path;
maintenance_window_start = 4; maintenance_window_start = 4;
overwriteprotocol = "https"; overwriteprotocol = "https";
trusted_proxies = [ trusted_proxies = [
@ -107,7 +92,6 @@ in
}) })
[ [
"pass" "pass"
"smtp"
] ]
); );
}; };
@ -125,7 +109,6 @@ in
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"Z ${service.paths.path0} 750 ${service.name} ${service.name} -" "Z ${service.paths.path0} 750 ${service.name} ${service.name} -"
"Z ${service.paths.path0}/config 750 ${service.name} ${service.name} -"
"Z ${service.sops.path0} 750 ${service.name} ${service.name} -" "Z ${service.sops.path0} 750 ${service.name} ${service.name} -"
]; ];

View file

@ -35,7 +35,7 @@ wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y
wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str]
wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str]
glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str]
nextcloud-smtp: ENC[AES256_GCM,data:GbNv/pHAtPru00m5OCER8g==,iv:Q1WYLKe34VsCvP1trk6IXm46RbVFMnsq4Eb5e2MBVgk=,tag:dwmimioRlHKbZeDv3THfzQ==,type:str] kanboard-smtp: ENC[AES256_GCM,data:FmmLEGr5Q8RHtie11Y88XQ==,iv:KtY/Bl2vpkXim7KrkK7cc5n0M0RDlxerbXu9jczj/hI=,tag:ZlbV6d1wH6KmbvHJR3Fq/w==,type:str]
sops: sops:
age: age:
- recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0
@ -47,7 +47,7 @@ sops:
bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD
aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-06-09T09:37:48Z" lastmodified: "2025-06-09T00:32:17Z"
mac: ENC[AES256_GCM,data:gBEfsR718Hn+GJ1wzxS3T1HOrNL659TUUq3l3nUNxbY2SxXWnnHxzdMhf2xP1/tm3Vst2MC/SjPszdbqVnVKIS1k+iwT+WSLH7OlbASku62cx9J9RKqm4PJd/2KtKR7Yaj4dU9+F7RnKtCA4N/m4ZA+BiD0oib76/Aa64tjVtDo=,iv:rJ+WfAFR8Un/u66Y2554BjDzJifQLdXNDexpl4GGClw=,tag:tY2biwFl7ywaHe3aTKjCMA==,type:str] mac: ENC[AES256_GCM,data:b4WMUmVOzgcz/ajxPl0OfQUGarUtnFIFS3DA9CjogPz6aVNDGWrVged5FB6UOotoqQ5RcgThewSu2HztEfCbhM0ZwZ0ak87XS8QHb++s97HhYeeh5mqgVnpsvF4Coa9aRpc2H4etuUNYFxoDojT/hTUKzg3a3QNSWzB06aKTd1A=,iv:YEJN5sakhN1rFytIDMIHpHAVYxvbt9iI2eXL2YBUYnY=,tag:SNBQWZIrXw4ptMLEqkR/xA==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.10.2 version: 3.10.2