diff --git a/hosts/srv-core/configuration.nix b/hosts/srv-core/configuration.nix index 7645421..962334b 100644 --- a/hosts/srv-core/configuration.nix +++ b/hosts/srv-core/configuration.nix @@ -4,78 +4,74 @@ system.stateVersion = "25.11"; - custom = - let - privateDomain = config.custom.networking.overlay.domain; - in - { - boot.loader.grub.enable = true; + custom = { + boot.loader.grub.enable = true; - networking = { - overlay.address = "10.254.250.6"; - underlay = { - interface = "enp2s0"; - cidr = "192.168.0.64/24"; - gateway = "192.168.0.1"; - }; - }; - - services = { - recursive-nameserver = { - enable = true; - blockAds = true; - }; - private-nameserver.enable = true; - - syncthing = { - enable = true; - isServer = true; - gui.domain = "syncthing.${privateDomain}"; - doBackups = true; - }; - - prometheus.storageRetentionSize = "20GB"; - }; - - web-services = { - atuin = { - enable = true; - domain = "atuin.${privateDomain}"; - }; - - filebrowser = { - enable = true; - domain = "files.${privateDomain}"; - doBackups = true; - }; - - radicale = { - enable = true; - domain = "dav.${privateDomain}"; - doBackups = true; - }; - - actualbudget = { - enable = true; - domain = "budget.${privateDomain}"; - doBackups = true; - }; - - karakeep = { - enable = true; - domain = "bookmarks.${privateDomain}"; - }; - - grafana = { - enable = true; - domain = "grafana.${privateDomain}"; - }; - - gatus = { - enable = true; - domain = "status.${privateDomain}"; - generateDefaultEndpoints = true; - }; + networking = { + overlay.address = "10.254.250.6"; + underlay = { + interface = "enp2s0"; + cidr = "192.168.0.64/24"; + gateway = "192.168.0.1"; }; }; + + services = { + recursive-nameserver = { + enable = true; + blockAds = true; + }; + private-nameserver.enable = true; + + syncthing = { + enable = true; + isServer = true; + gui.domain = "syncthing.${config.custom.networking.overlay.domain}"; + doBackups = true; + }; + + prometheus.storageRetentionSize = "20GB"; + }; + + web-services = { + atuin = { + enable = true; + domain = "atuin.${config.custom.networking.overlay.domain}"; + }; + + filebrowser = { + enable = true; + domain = "files.${config.custom.networking.overlay.domain}"; + doBackups = true; + }; + + radicale = { + enable = true; + domain = "dav.${config.custom.networking.overlay.domain}"; + doBackups = true; + }; + + actualbudget = { + enable = true; + domain = "budget.${config.custom.networking.overlay.domain}"; + doBackups = true; + }; + + karakeep = { + enable = true; + domain = "bookmarks.${config.custom.networking.overlay.domain}"; + }; + + grafana = { + enable = true; + domain = "grafana.${config.custom.networking.overlay.domain}"; + }; + + gatus = { + enable = true; + domain = "status.${config.custom.networking.overlay.domain}"; + generateDefaultEndpoints = true; + }; + }; + }; } diff --git a/hosts/vps-www/configuration.nix b/hosts/vps-www/configuration.nix index a9729eb..f9909f1 100644 --- a/hosts/vps-www/configuration.nix +++ b/hosts/vps-www/configuration.nix @@ -4,74 +4,66 @@ system.stateVersion = "25.11"; - custom = - let - sproutedDomain = "sprouted.cloud"; - in - { - boot.loader.systemd-boot.enable = true; + custom = { + boot.loader.systemd-boot.enable = true; - networking = { - overlay.address = "10.254.250.4"; - underlay = { - interface = "enp1s0"; - cidr = "167.235.73.246/32"; - isPublic = true; - gateway = "172.31.1.1"; - }; + networking = { + overlay.address = "10.254.250.4"; + underlay = { + interface = "enp1s0"; + cidr = "167.235.73.246/32"; + isPublic = true; + gateway = "172.31.1.1"; }; - - services.public-nameserver = { - enable = true; - publicHostName = "ns2"; - zones = [ - "sprouted.cloud" - "sstork.dev" - ]; - }; - - web-services = - let - sstorkDomain = "sstork.dev"; - in - { - personal-blog = { - enable = true; - domain = sstorkDomain; - }; - - forgejo = { - enable = true; - domain = "git.${sstorkDomain}"; - doBackups = true; - }; - - outline = { - enable = true; - domain = "wiki.${sproutedDomain}"; - doBackups = true; - }; - - it-tools = { - enable = true; - domain = "it-tools.${sproutedDomain}"; - }; - - networking-toolbox = { - enable = true; - domain = "net-tools.${sproutedDomain}"; - }; - - privatebin = { - enable = true; - domain = "pastebin.${sproutedDomain}"; - branding.name = "SproutedBin"; - }; - - screego = { - enable = true; - domain = "mirror.${sproutedDomain}"; - }; - }; }; + + services.public-nameserver = { + enable = true; + publicHostName = "ns2"; + zones = [ + "sprouted.cloud" + "sstork.dev" + ]; + }; + + web-services = { + personal-blog = { + enable = true; + domain = "sstork.dev"; + }; + + forgejo = { + enable = true; + domain = "git.sstork.dev"; + doBackups = true; + }; + + outline = { + enable = true; + domain = "wiki.sprouted.cloud"; + doBackups = true; + }; + + it-tools = { + enable = true; + domain = "it-tools.sprouted.cloud"; + }; + + networking-toolbox = { + enable = true; + domain = "net-tools.sprouted.cloud"; + }; + + privatebin = { + enable = true; + domain = "pastebin.sprouted.cloud"; + branding.name = "SproutedBin"; + }; + + screego = { + enable = true; + domain = "mirror.sprouted.cloud"; + }; + }; + }; }