Avoid "networking.domain"

This commit is contained in:
SebastianStork 2025-05-28 21:11:51 +02:00
parent 383235ae24
commit d5f7e88b59
10 changed files with 32 additions and 29 deletions

View file

@ -1,14 +1,14 @@
{ config, ... }:
let
inherit (config.custom) services;
inherit (config.custom.services.tailscale) caddyServe;
tsDomain = config.custom.services.tailscale.domain;
portOf = service: config.custom.services.${service}.port;
in
{
system.stateVersion = "24.11";
custom = {
boot.loader.systemdBoot.enable = true;
sops.enable = true;
boot.loader.systemdBoot.enable = true;
services = {
tailscale = {
@ -24,32 +24,32 @@ in
caddyServe = {
nextcloud = {
subdomain = "cloud";
inherit (services.nextcloud) port;
port = portOf "nextcloud";
};
actualbudget = {
subdomain = "budget";
inherit (services.actualbudget) port;
port = portOf "actualbudget";
};
forgejo = {
subdomain = "git";
inherit (services.forgejo) port;
port = portOf "forgejo";
};
};
};
nextcloud = {
enable = true;
inherit (caddyServe.nextcloud) subdomain;
domain = "cloud.${tsDomain}";
backups.enable = true;
};
actualbudget = {
enable = true;
inherit (caddyServe.actualbudget) subdomain;
domain = "budget.${tsDomain}";
backups.enable = true;
};
forgejo = {
enable = true;
inherit (caddyServe.forgejo) subdomain;
domain = "git.${tsDomain}";
};
syncthing = {

View file

@ -1,11 +1,10 @@
{ config, ... }:
{
system.stateVersion = "24.11";
networking.domain = "sprouted.cloud";
custom = {
boot.loader.grub.enable = true;
sops.enable = true;
boot.loader.grub.enable = true;
services = {
tailscale = {
@ -15,7 +14,7 @@
hedgedoc = {
enable = true;
subdomain = "docs";
domain = "docs.sprouted.cloud";
backups.enable = true;
};
@ -32,7 +31,7 @@
services.caddy = {
enable = true;
virtualHosts."docs.${config.networking.domain}".extraConfig = ''
virtualHosts.${config.custom.services.hedgedoc.domain}.extraConfig = ''
reverse_proxy localhost:${toString config.custom.services.hedgedoc.port}
'';
};

View file

@ -9,8 +9,6 @@
{
imports = [ self.nixosModules.default ];
networking.domain = lib.mkDefault "stork-atlas.ts.net";
nix =
let
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;