diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix index 8599cff..a8beb12 100644 --- a/hosts/nas/default.nix +++ b/hosts/nas/default.nix @@ -1,29 +1,64 @@ -{ self, ... }: +{ config, self, ... }: { imports = [ self.nixosModules.server-profile ]; system.stateVersion = "25.11"; - custom = { - boot.loader.grub.enable = true; + custom = + let + privateDomain = config.custom.networking.overlay.domain; + in + { + 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"; + networking = { + overlay.address = "10.254.250.6"; + underlay = { + interface = "enp2s0"; + cidr = "192.168.0.64/24"; + gateway = "192.168.0.1"; + }; + }; + + services = { + dns.enable = true; + + syncthing = { + enable = true; + isServer = true; + gui.domain = "syncthing.${privateDomain}"; + doBackups = true; + }; + + atuin = { + enable = true; + domain = "atuin.${privateDomain}"; + }; + }; + + web-services = { + 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}"; + }; }; }; - - services = { - dns.enable = true; - - syncthing = { - enable = true; - isServer = true; - gui.domain = "syncthing.nas.splitleaf.de"; - }; - }; - }; } diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix index 9246d72..8a64677 100644 --- a/hosts/vps-private/default.nix +++ b/hosts/vps-private/default.nix @@ -1,61 +1,25 @@ -{ config, self, ... }: +{ self, ... }: { imports = [ self.nixosModules.server-profile ]; system.stateVersion = "25.11"; - custom = - let - privateDomain = config.custom.networking.overlay.domain; - in - { - boot.loader.systemd-boot.enable = true; + custom = { + boot.loader.systemd-boot.enable = true; - networking = { - overlay = { - address = "10.254.250.2"; - isLighthouse = true; - }; - underlay = { - interface = "enp1s0"; - cidr = "49.13.231.235/32"; - isPublic = true; - gateway = "172.31.1.1"; - }; + networking = { + overlay = { + address = "10.254.250.2"; + isLighthouse = true; }; - - services = { - dns.enable = true; - - atuin = { - enable = true; - domain = "atuin.${privateDomain}"; - }; - }; - - web-services = { - 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}"; - }; + underlay = { + interface = "enp1s0"; + cidr = "49.13.231.235/32"; + isPublic = true; + gateway = "172.31.1.1"; }; }; + + services.dns.enable = true; + }; }