Rename the namespace of the system-modules

This commit is contained in:
SebastianStork 2025-05-27 22:19:35 +02:00
parent 61f32cb7ea
commit 06623cd93a
34 changed files with 162 additions and 153 deletions

View file

@ -1,61 +1,63 @@
{ config, ... }:
let
inherit (config) myConfig;
inherit (config.myConfig.tailscale) caddyServe;
inherit (config.custom) services;
inherit (config.custom.services.tailscale) caddyServe;
in
{
system.stateVersion = "24.11";
myConfig = {
custom = {
boot.loader.systemdBoot.enable = true;
sops.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
exitNode.enable = true;
services = {
tailscale = {
enable = true;
ssh.enable = true;
exitNode.enable = true;
serve = {
isFunnel = true;
target = toString ./hedgedoc-redirect.html;
};
serve = {
isFunnel = true;
target = toString ./hedgedoc-redirect.html;
};
caddyServe = {
nextcloud = {
subdomain = "cloud";
inherit (myConfig.nextcloud) port;
};
actualbudget = {
subdomain = "budget";
inherit (myConfig.actualbudget) port;
};
forgejo = {
subdomain = "git";
inherit (myConfig.forgejo) port;
caddyServe = {
nextcloud = {
subdomain = "cloud";
inherit (services.nextcloud) port;
};
actualbudget = {
subdomain = "budget";
inherit (services.actualbudget) port;
};
forgejo = {
subdomain = "git";
inherit (services.forgejo) port;
};
};
};
};
nextcloud = {
enable = true;
inherit (caddyServe.nextcloud) subdomain;
backups.enable = true;
};
actualbudget = {
enable = true;
inherit (caddyServe.actualbudget) subdomain;
backups.enable = true;
};
forgejo = {
enable = true;
inherit (caddyServe.forgejo) subdomain;
};
nextcloud = {
enable = true;
inherit (caddyServe.nextcloud) subdomain;
backups.enable = true;
};
actualbudget = {
enable = true;
inherit (caddyServe.actualbudget) subdomain;
backups.enable = true;
};
forgejo = {
enable = true;
inherit (caddyServe.forgejo) subdomain;
};
syncthing = {
enable = true;
deviceId = "5R2MH7T-Q2ZZS2P-ZMSQ2UJ-B6VBHES-XYLNMZ6-7FYC27L-4P7MGJ2-FY4ITQD";
isServer = true;
backups.enable = true;
syncthing = {
enable = true;
deviceId = "5R2MH7T-Q2ZZS2P-ZMSQ2UJ-B6VBHES-XYLNMZ6-7FYC27L-4P7MGJ2-FY4ITQD";
isServer = true;
backups.enable = true;
};
};
};
}

View file

@ -3,35 +3,37 @@
system.stateVersion = "24.11";
networking.domain = "sprouted.cloud";
myConfig = {
custom = {
boot.loader.grub.enable = true;
sops.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
};
services = {
tailscale = {
enable = true;
ssh.enable = true;
};
hedgedoc = {
enable = true;
subdomain = "docs";
backups.enable = true;
};
hedgedoc = {
enable = true;
subdomain = "docs";
backups.enable = true;
};
crowdsec = {
enable = true;
firewallBouncer.enable = true;
sources = [
"iptables"
"caddy"
];
crowdsec = {
enable = true;
firewallBouncer.enable = true;
sources = [
"iptables"
"caddy"
];
};
};
};
services.caddy = {
enable = true;
virtualHosts."docs.${config.networking.domain}".extraConfig = ''
reverse_proxy localhost:${toString config.myConfig.hedgedoc.port}
reverse_proxy localhost:${toString config.custom.services.hedgedoc.port}
'';
};

View file

@ -14,7 +14,8 @@
}
);
myConfig = {
custom = {
sops.enable = true;
boot = {
loader.systemdBoot.enable = true;
silent = true;
@ -23,21 +24,22 @@
dm.tuigreet.enable = true;
de.hyprland.enable = true;
wlan.enable = true;
bluetooth.enable = true;
sound.enable = true;
virtualisation.enable = true;
sops.enable = true;
gc.enable = true;
geoclue.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
};
syncthing = {
enable = true;
deviceId = "Q4YPD3V-GXZPHSN-PT5X4PU-FBG4GX2-IASBX75-7NYMG75-4EJHBMZ-4WGDDAP";
services = {
wlan.enable = true;
bluetooth.enable = true;
sound.enable = true;
gc.enable = true;
geoclue.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
};
syncthing = {
enable = true;
deviceId = "Q4YPD3V-GXZPHSN-PT5X4PU-FBG4GX2-IASBX75-7NYMG75-4EJHBMZ-4WGDDAP";
};
};
};
}

View file

@ -14,7 +14,8 @@
}
);
myConfig = {
custom = {
sops.enable = true;
boot = {
loader.systemdBoot.enable = true;
silent = true;
@ -23,20 +24,22 @@
dm.tuigreet.enable = true;
de.hyprland.enable = true;
sound.enable = true;
virtualisation.enable = true;
sops.enable = true;
gc.enable = true;
geoclue.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
};
syncthing = {
enable = true;
deviceId = "FAJS5WM-UAWGW2U-FXCGPSP-VAUOTGM-XUKSEES-D66PMCJ-WBODJLV-XTNCRA7";
services = {
sound.enable = true;
gc.enable = true;
geoclue.enable = true;
tailscale = {
enable = true;
ssh.enable = true;
};
syncthing = {
enable = true;
deviceId = "FAJS5WM-UAWGW2U-FXCGPSP-VAUOTGM-XUKSEES-D66PMCJ-WBODJLV-XTNCRA7";
};
};
steam.enable = true;
programs.steam.enable = true;
};
}