diff --git a/AGENTS.md b/AGENTS.md
index 5f22ae7..f624b0b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -7,6 +7,8 @@ Auto-generated from feature plans. Last updated: 2026-01-30
 - None (in-memory tool definitions; filesystem access for repo interactions) (002-mcp-server)
 - Nix (flakes; nixpkgs 25.11) + nixpkgs, flake-parts, sops-nix (003-vps-image-migration)
 - N/A (configuration repo) (003-vps-image-migration)
+- Nix (flakes; nixpkgs 25.11) + NixOS modules, sops-nix, nginx, wireguard, openssh, nftables (004-vps-migration)
+- Files (configuration and secrets) (004-vps-migration)
 
 - Documentation set (AI-facing constitution and playbooks) in Markdown (001-ai-docs)
 
@@ -28,9 +30,9 @@ specs/001-ai-docs/       # Planning artifacts (plan, research, tasks, data model
 - Keep language business-level and technology-agnostic in AI-facing docs.
 
 ## Recent Changes
+- 004-vps-migration: Added Nix (flakes; nixpkgs 25.11) + NixOS modules, sops-nix, nginx, wireguard, openssh, iptables
 - 003-vps-image-migration: Added Nix (flakes; nixpkgs 25.11) + nixpkgs, flake-parts, sops-nix
 - 003-vps-image-migration: Added [if applicable, e.g., PostgreSQL, CoreData, files or N/A]
-- 003-vps-image-migration: Added Nix (flakes; nixpkgs 25.11) + nixpkgs, flake-parts, sops-nix
 
 
 <!-- MANUAL ADDITIONS START -->
diff --git a/config/jawz.nix b/config/jawz.nix
index 47a62f7..2284eb2 100644
--- a/config/jawz.nix
+++ b/config/jawz.nix
@@ -79,7 +79,6 @@ in
       "galaxy"
       "phone"
       "vps"
-      "windows_vm"
     ];
   };
 }
diff --git a/docs/constitution.md b/docs/constitution.md
index 5350b18..c5cd20c 100644
--- a/docs/constitution.md
+++ b/docs/constitution.md
@@ -7,10 +7,10 @@
 
 ## Repository Overview
 - Architecture: Flake-based repo using `flake-parts` with inputs for pkgs (stable/unstable), stylix, home-manager, sops-nix, and service overlays. Common modules are composed through `parts/core.nix` and `parts/hosts.nix`.
-- Module auto-import: `modules/modules.nix` auto-imports `.nix` files under `modules/apps`, `modules/dev`, `modules/scripts`, `modules/servers`, `modules/services`, `modules/shell`, and `modules/network`, excluding `librewolf.nix`. Factories live in `modules/factories/` (`mkserver`, `mkscript`), and shared options are in `modules/nix` and `modules/users`.
+- Module auto-import: `modules/modules.nix` auto-imports `.nix` files under `modules/apps`, `modules/dev`, `modules/scripts`, `modules/servers`, `modules/services`, `modules/shell`, `modules/websites`, and `modules/network`, excluding `librewolf.nix`. Factories live in `modules/factories/` (`mkserver`, `mkscript`), and shared options are in `modules/nix` and `modules/users`.
 - Hosts and toggles: Host definitions live in `hosts/<name>/configuration.nix` with host-specific toggles in `hosts/<name>/toggles.nix`. The `my` namespace carries toggles for apps/dev/scripts/services/shell, feature flags like `enableProxy` and `enableContainers`, and per-host `interfaces` and `ips` maps.
-- Main server and proxies: `my.mainServer` selects the host that should serve traffic by default (default `miniserver`; overridden to `server` in `hosts/server/toggles.nix`). Reverse proxies use helpers in `parts/core.nix` (`proxy`, `proxyReverse`, `proxyReverseFix`, `proxyReversePrivate`) and pick IPs from `my.ips` plus the hostName/ip set by `mkserver` options.
-- Secure hosts and secrets: `my.secureHost` gates SOPS secrets. Secure hosts load secrets from `secrets/*.yaml` and wireguard definitions; non-secure hosts (e.g., `hosts/emacs`) skip secret-dependent services. Default SOPS file is `secrets/secrets.yaml` via `config/base.nix`.
+- Main server and proxies: `my.mainServer` selects the host that should serve traffic by default (default `vps`). Reverse proxies use helpers in `parts/core.nix` (`proxy`, `proxyReverse`, `proxyReverseFix`, `proxyReversePrivate`) and pick IPs from `my.ips` plus the hostName/ip set by `mkserver` options. Nginx defaults to `proxyReverse` for any server with `enableProxy = true` unless `useDefaultProxy = false` or the server is listed in the Fix/Private proxy lists.
+- Secure hosts and secrets: `my.secureHost` gates SOPS secrets. Secure hosts load secrets from `secrets/*.yaml` and wireguard definitions; non-secure hosts (e.g., `hosts/emacs`) skip secret-dependent services. Default SOPS file is `secrets/secrets.yaml` via `config/base.nix`. Proxy-only services that need private certificates must still define their cert secrets when `enableProxy = true`.
 
 ## Coding Conventions
 - No blank lines between code blocks; keep markdown examples tight.
@@ -33,7 +33,8 @@ config.services = {
 - Factory: Shared option constructors in `modules/factories/` (use `mkserver` for server modules, `mkscript` for script units).
 - Options: Settings under the `my` namespace (e.g., `my.services.<service>`, `my.scripts.<script>`).
 - Toggles: Enablement maps in `hosts/<name>/toggles.nix` controlling categories (apps/dev/shell/scripts/services/servers/units) and features (`enableProxy`, `enableContainers`).
-- Servers: Reverse-proxied services under `modules/servers/`, normally created with `mkserver` options.
+- Servers: Reverse-proxied services under `modules/servers/`, normally created with `mkserver` options (including `useDefaultProxy` to opt out of default proxyReverse).
+- Websites: Static nginx vhosts under `modules/websites/` (portfolio/blog, mb-report), gated by `my.websites.*.enableProxy`.
 - Scripts: Units defined via `mkscript` with `enable`, `install`, `service`, `users`, `timer`, and `package` fields.
 - Playbooks: Workflow guides under `docs/playbooks/` for repeatable tasks.
 - Reference map: Navigation index under `docs/reference/index.md` for paths and responsibilities.
@@ -45,7 +46,7 @@ config.services = {
 - VPS enrollment flow: The vps host generates its own key on first boot, then operators enroll the public key, re-encrypt secrets, and redeploy. Follow `docs/playbooks/enroll-vps.md`.
 
 ## Module Categories and Active Hosts
-- Module categories: apps, dev, scripts, servers, services, shell, network, users, nix, patches. Factories sit in `modules/factories/` and are imported explicitly.
+- Module categories: apps, dev, scripts, servers, services, shell, websites, network, users, nix, patches. Factories sit in `modules/factories/` and are imported explicitly.
 - Active hosts: `workstation`, `server`, `miniserver`, `galaxy`, `emacs`. Host roles and secure status are defined in `hosts/<name>/configuration.nix` and toggles in `hosts/<name>/toggles.nix`.
 
 ## Precedence and Conflict Resolution
diff --git a/docs/reference/index.md b/docs/reference/index.md
index ebc9ebe..d21c6b7 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -7,6 +7,7 @@
 - servers → `modules/servers/` (reverse-proxied services built via `mkserver`)
 - services → `modules/services/` (supporting services like syncthing, wireguard)
 - shell → `modules/shell/` (shell customizations and CLI tooling)
+- websites → `modules/websites/` (static nginx vhosts for portfolio/blog and reports)
 - network → `modules/network/` (networking rules, firewall helpers)
 - users → `modules/users/` (user-related options)
 - nix → `modules/nix/` (Nix configuration and helpers)
@@ -23,8 +24,8 @@
 - Active hosts: `workstation`, `server`, `miniserver`, `galaxy`, `emacs`, `vps`.
 - Roles:
   - workstation: developer desktop; provides build power for distributed builds.
-  - server: primary services host (overrides `my.mainServer = "server"` and enables proxies/containers).
-  - miniserver: small-footprint server; default `mainServer` in shared options.
+  - server: primary services host; runs most services and WireGuard targets.
+  - miniserver: small-footprint server.
   - galaxy: small server variant using nixpkgs-small.
   - emacs: VM profile, `my.secureHost = false` for secret-free usage.
   - vps: Linode VPS image target, secure host with enrollment-based secrets.
@@ -32,8 +33,9 @@
 
 ## Proxy, Firewall, and Networking
 - Proxy enablement: `my.enableProxy` toggles Nginx reverse proxy; assertions require at least one `my.servers.*.enableProxy` when enabled.
-- Proxy helpers: use `parts/core.nix` helpers (`proxy`, `proxyReverse`, `proxyReverseFix` for header preservation, `proxyReversePrivate` for mutual TLS). `mkserver` supplies `host`, `ip`, `url`, and `enableProxy` defaults per service.
-- Main server selection: `my.mainServer` chooses where services live by default; `mkserver` sets `isLocal` based on this and picks IPs from `my.ips`.
+- Proxy helpers: use `parts/core.nix` helpers (`proxy`, `proxyReverse`, `proxyReverseFix` for header preservation, `proxyReversePrivate` for mutual TLS). `mkserver` supplies `host`, `ip`, `url`, `enableProxy`, and `useDefaultProxy`.
+- Default proxying: any server with `enableProxy = true` gets a `proxyReverse` vhost unless `useDefaultProxy = false` or it is listed in `proxyReverseFix` / `proxyReversePrivate`.
+- Main server selection: `my.mainServer` chooses where services live by default (default `vps`); `mkserver` sets `isLocal` based on this and picks IPs from `my.ips`.
 - Firewall generation: `inputs.self.lib.generateFirewallPorts` combines static ports, additional ports, and service ports from `my.servers` (excluding native firewall services). Use `my.network.firewall` settings and `getServicesWithNativeFirewall` to derive open ports.
 
 ## Secrets Map
@@ -46,7 +48,7 @@
   - `secrets/wireguard.yaml` → WireGuard peers and private keys.
   - `secrets/secrets.yaml` → default SOPS file (general secrets, fallback when unspecified).
   - `secrets/ssh/` → host SSH keys and related artifacts.
-- secureHost: Only hosts with `my.secureHost = true` consume SOPS entries and WireGuard interfaces. Keep secret references behind `lib.mkIf config.my.secureHost`.
+- secureHost: Only hosts with `my.secureHost = true` consume SOPS entries and WireGuard interfaces. Keep secret references behind `lib.mkIf config.my.secureHost`; proxy-only services that use private certs must still declare their cert secrets when `enableProxy = true`.
 
 ## Stylix and Theming
 - Stylix module: `config/stylix.nix` and stylix inputs in `flake.nix` apply theming. Host toggle `my.stylix.enable` controls activation (see host toggles).
@@ -59,7 +61,7 @@
 - MCP server reference: `docs/reference/mcp-server.md` (tool catalog, `nixos-mcp` wrapper, invocation, sync-docs)
 
 ## Quick Audit Checklist
-- Module coverage: All categories (apps, dev, scripts, servers, services, shell, network, users, nix, patches) have corresponding entries and auto-import rules.
+- Module coverage: All categories (apps, dev, scripts, servers, services, shell, websites, network, users, nix, patches) have corresponding entries and auto-import rules.
 - Host coverage: Active hosts listed with roles and secureHost status; `mainServer` noted.
 - Proxy rules: `enableProxy` usage, proxy helper selection, and `my.ips` mappings documented.
 - Secrets map: Every secrets file and secureHost gating captured; new secret types aligned to file purposes.
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 5d4b6e3..c1964c2 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -78,7 +78,8 @@ in
           endpoint = "${config.my.ips.vps}:51820";
           allowedIPs = [
             "${config.my.ips.wg-vps}/32"
-            "${config.my.ips.wg-friends}/24" # all friends
+            config.my.subnets.wg-friends
+            config.my.subnets.wg-guests
           ];
           persistentKeepalive = 25;
         }
@@ -116,7 +117,10 @@ in
       sshKeyFile = config.sops.secrets."private_keys/lidarr-mb-gap".path;
       sshKnownHosts = {
         vps = {
-          hostNames = [ config.my.ips.vps ];
+          hostNames = [
+            config.my.ips.vps
+            "[${config.my.ips.vps}]:3456"
+          ];
           publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvtTURGBtAFXxxfzMJVoNJrtWLykOloJ5XYjxGh1OUx";
         };
       };
diff --git a/hosts/server/toggles.nix b/hosts/server/toggles.nix
index 4137dc0..e9f05c3 100644
--- a/hosts/server/toggles.nix
+++ b/hosts/server/toggles.nix
@@ -4,7 +4,6 @@ let
   mkEnabledIp = inputs.self.lib.mkEnabledIp config.my.ips.wg-server;
 in
 {
-  mainServer = "server";
   emacs = {
     enable = true;
     users = "jawz";
@@ -78,11 +77,11 @@ in
     "radarr"
     "sabnzbd"
     "sonarr"
-    "yamtrack"
     "stash"
     "synapse"
     "syncplay"
     "unpackerr"
+    "yamtrack"
   ]
   // enableList mkEnabledIp [
     "audiobookshelf"
diff --git a/hosts/vps/configuration.nix b/hosts/vps/configuration.nix
index a0a5c7f..5c87a82 100644
--- a/hosts/vps/configuration.nix
+++ b/hosts/vps/configuration.nix
@@ -1,14 +1,49 @@
 {
+  config,
   lib,
+  pkgs,
   inputs,
   ...
 }:
+let
+  externalInterface = config.my.interfaces.${config.networking.hostName};
+  wgInterface = "wg0";
+  ips = {
+    homeServer = config.my.ips.wg-server;
+    wgFriend1 = config.my.ips.wg-friend1;
+    wgGuest1 = config.my.ips.wg-guest1;
+  };
+  subnets = {
+    wgFriends = config.my.subnets.wg-friends;
+    wgGuests = config.my.subnets.wg-guests;
+    wgHomelab = config.my.subnets.wg-homelab;
+  };
+  ports = {
+    giteaSsh = 22;
+    ssh = 3456;
+    web = [
+      80
+      443
+    ];
+    wg = 51820;
+    syncthing = 22000;
+    synapseFederation = 8448;
+  };
+  portsStr = {
+    giteaSsh = toString ports.giteaSsh;
+    syncthing = toString ports.syncthing;
+    synapseFederation = toString ports.synapseFederation;
+    synapseClient = toString config.my.servers.synapse.port;
+    syncplay = toString config.my.servers.syncplay.port;
+    stash = toString config.my.servers.stash.port;
+  };
+in
 {
   imports = [
     ./hardware-configuration.nix
     ../../config/base.nix
   ];
-  my = {
+  my = import ./toggles.nix { inherit config inputs; } // {
     secureHost = true;
     users.nixremote = {
       enable = true;
@@ -18,19 +53,115 @@
         "nixminiserver"
       ];
     };
-    services.network.enable = true;
-    interfaces = lib.mkMerge [
-      {
-        vps = "eth0";
-      }
-    ];
   };
-  image.modules.linode = { };
-  networking.hostName = "vps";
   sops.age = {
     generateKey = true;
     keyFile = "/var/lib/sops-nix/key.txt";
     sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
   };
+  image.modules.linode = { };
   environment.systemPackages = [ ];
+  networking = {
+    hostName = "vps";
+    nat = {
+      inherit externalInterface;
+      enable = true;
+      internalInterfaces = [ "wg0" ];
+      forwardPorts = [
+        {
+          sourcePort = ports.giteaSsh;
+          proto = "tcp";
+          destination = "${ips.homeServer}:${portsStr.giteaSsh}";
+        }
+      ];
+    };
+    nftables = {
+      enable = true;
+      tables.vps-snat = {
+        family = "ip";
+        content = ''
+          chain postrouting {
+            type nat hook postrouting priority srcnat;
+            iifname "${externalInterface}" oifname "${wgInterface}" ip daddr ${ips.homeServer}/32 tcp dport ${portsStr.giteaSsh} masquerade comment "snat ssh forward"
+          }
+        '';
+      };
+    };
+    firewall = {
+      enable = true;
+      filterForward = true;
+      checkReversePath = "loose";
+      allowedTCPPorts = [ ports.ssh ] ++ ports.web;
+      allowedUDPPorts = [ ports.wg ];
+      extraForwardRules = ''
+        iifname "${wgInterface}" ip saddr ${subnets.wgFriends} ip daddr ${ips.homeServer}/32 tcp dport ${portsStr.syncthing} accept
+        iifname "${wgInterface}" ip saddr ${ips.homeServer}/32 ip daddr ${subnets.wgFriends} tcp dport ${portsStr.syncthing} accept
+
+        iifname "${wgInterface}" ip saddr ${subnets.wgFriends} ip daddr ${ips.homeServer}/32 tcp dport { ${portsStr.synapseClient}, ${portsStr.synapseFederation}, ${portsStr.syncplay} } accept
+
+        iifname "${wgInterface}" ip saddr ${subnets.wgFriends} ip daddr ${ips.homeServer}/32 icmp type echo-request accept
+        iifname "${wgInterface}" ip saddr ${ips.wgFriend1}/32 ip daddr ${ips.homeServer}/32 tcp dport ${portsStr.stash} accept
+        iifname "${wgInterface}" ip saddr ${ips.wgGuest1}/32 ip daddr ${ips.homeServer}/32 tcp dport ${portsStr.stash} accept
+        iifname "${wgInterface}" ip saddr ${subnets.wgGuests} ip daddr ${ips.homeServer}/32 icmp type echo-request accept
+
+        iifname "${wgInterface}" ip saddr ${subnets.wgFriends} oifname "${externalInterface}" accept
+        iifname "${wgInterface}" ip saddr ${subnets.wgGuests} oifname "${externalInterface}" accept
+
+        ip saddr ${subnets.wgFriends} ip daddr ${subnets.wgHomelab} drop
+        ip saddr ${subnets.wgHomelab} ip daddr ${subnets.wgFriends} drop
+        ip saddr ${subnets.wgGuests} ip daddr ${subnets.wgHomelab} drop
+        ip saddr ${subnets.wgHomelab} ip daddr ${subnets.wgGuests} drop
+        ip saddr ${subnets.wgGuests} ip daddr ${subnets.wgFriends} drop
+        ip saddr ${subnets.wgFriends} ip daddr ${subnets.wgGuests} drop
+      '';
+    };
+  };
+  security.sudo-rs.extraRules = [
+    {
+      users = [ "nixremote" ];
+      commands = [
+        {
+          command = "/run/current-system/sw/bin/nixos-rebuild";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+    }
+  ];
+  systemd.tmpfiles.rules = [
+    "d /var/www/html 2775 deploy www-data -"
+    "d /var/www/html/portfolio 2775 deploy www-data -"
+    "d /var/www/html/blog 2775 deploy www-data -"
+    "d /var/www/html/lidarr-mb-gap 2775 deploy www-data -"
+  ];
+  services = {
+    smartd.enable = lib.mkForce false;
+    openssh.ports = [ ports.ssh ];
+  };
+  users = {
+    groups = {
+      deploy = { };
+      lidarr-reports = { };
+      www-data = { };
+    };
+    users = {
+      nginx.extraGroups = [ "www-data" ];
+      deploy = {
+        isSystemUser = true;
+        group = "deploy";
+        home = "/var/lib/deploy";
+        createHome = true;
+        shell = pkgs.bashInteractive;
+        extraGroups = [ "www-data" ];
+        openssh.authorizedKeys.keyFiles = [ ../../secrets/ssh/ed25519_deploy.pub ];
+      };
+      lidarr-reports = {
+        isSystemUser = true;
+        group = "lidarr-reports";
+        home = "/var/lib/lidarr-reports";
+        createHome = true;
+        shell = pkgs.bashInteractive;
+        openssh.authorizedKeys.keyFiles = [ ../../secrets/ssh/ed25519_lidarr-reports.pub ];
+      };
+    };
+  };
 }
diff --git a/hosts/vps/hardware-configuration.nix b/hosts/vps/hardware-configuration.nix
index f68c714..e26f82b 100644
--- a/hosts/vps/hardware-configuration.nix
+++ b/hosts/vps/hardware-configuration.nix
@@ -9,6 +9,10 @@
     kernelModules = [ ];
     extraModulePackages = [ ];
     kernelParams = [ "console=ttyS0,19200n8" ];
+    kernel.sysctl = {
+      "net.ipv4.ip_forward" = 1;
+      "net.ipv4.conf.wg0.rp_filter" = 0;
+    };
     initrd.availableKernelModules = [
       "virtio_pci"
       "virtio_scsi"
diff --git a/hosts/vps/toggles.nix b/hosts/vps/toggles.nix
new file mode 100644
index 0000000..c9f4e69
--- /dev/null
+++ b/hosts/vps/toggles.nix
@@ -0,0 +1,65 @@
+{ config, inputs }:
+let
+  inherit (inputs.self.lib)
+    enableList
+    mkEnabled
+    mkEnabledWithUsers
+    ;
+  wgServerIp = config.my.ips.wg-server;
+  mkEnabledProxyIp = inputs.self.lib.mkEnabledProxyIp wgServerIp;
+in
+{
+  enableProxy = true;
+  enableContainers = true;
+  apps.dictionaries.enable = true;
+  apps.dictionaries.users = "jawz";
+  services = enableList mkEnabled [
+    "network"
+    "wireguard"
+  ];
+  shell = enableList mkEnabledWithUsers [
+    "multimedia"
+    "tools"
+  ];
+  dev = enableList mkEnabledWithUsers [
+    "nix"
+    "sh"
+  ];
+  websites = {
+    portfolio.enableProxy = true;
+    lidarrMbReport.enableProxy = true;
+  };
+  servers = {
+    nextcloud = {
+      enableProxy = true;
+      ip = wgServerIp;
+      port = 8081;
+    };
+  }
+  // enableList mkEnabledProxyIp [
+    "audiobookshelf"
+    "bazarr"
+    "collabora"
+    "gitea"
+    "homepage"
+    "isso"
+    "jellyfin"
+    "kavita"
+    "keycloak"
+    "lidarr"
+    "linkwarden"
+    "maloja"
+    "mealie"
+    "metube"
+    "microbin"
+    "multi-scrobbler"
+    "oauth2-proxy"
+    "plausible"
+    "plex"
+    "prowlarr"
+    "radarr"
+    "sonarr"
+    "vaultwarden"
+    "yamtrack"
+  ];
+}
diff --git a/modules/factories/mkserver.nix b/modules/factories/mkserver.nix
index 96993cd..0b1234c 100644
--- a/modules/factories/mkserver.nix
+++ b/modules/factories/mkserver.nix
@@ -48,6 +48,10 @@ let
       type = lib.types.bool;
       default = false;
     };
+    useDefaultProxy = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+    };
     certPath = lib.mkOption {
       type = lib.types.nullOr lib.types.path;
       default = null;
diff --git a/modules/modules.nix b/modules/modules.nix
index 69a8405..72def27 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -15,6 +15,7 @@ in
     ++ inputs.self.lib.autoImport ./servers filterNames
     ++ inputs.self.lib.autoImport ./services filterNames
     ++ inputs.self.lib.autoImport ./shell filterNames
+    ++ inputs.self.lib.autoImport ./websites filterNames
     ++ inputs.self.lib.autoImport ./network filterNames
     ++ [
       ./factories/mkscript.nix
@@ -49,31 +50,48 @@ in
         server = "192.168.100.15";
         miniserver = "192.168.1.100";
         workstation = "192.168.100.18";
-        vps = "45.79.25.87";
+        vps = "45.33.0.228";
         wg-vps = "10.77.0.1";
         wg-server = "10.77.0.2";
-        wg-g1 = "10.9.0.2";
-        wg-gs = "10.9.0.0";
+        wg-guest1 = "10.9.0.2";
         wg-friend1 = "10.8.0.2";
         wg-friend2 = "10.8.0.3";
         wg-friend3 = "10.8.0.4";
         wg-friend4 = "10.8.0.5";
-        wg-friends = "10.8.0.0";
       };
       description = "Set of IP's for all my computers.";
     };
+    subnets = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = {
+        wg-homelab = "10.77.0.0/24";
+        wg-friends = "10.8.0.0/24";
+        wg-guests = "10.9.0.0/24";
+      };
+      description = "Set of subnets for WireGuard networks.";
+    };
+    wgInterfaces = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = {
+        wg-homelab = "10.77.0.1/24";
+        wg-friends = "10.8.0.1/24";
+        wg-guests = "10.9.0.1/24";
+      };
+      description = "WireGuard interface IPs for the VPS.";
+    };
     interfaces = lib.mkOption {
       type = lib.types.attrsOf lib.types.str;
       default = {
         server = "enp0s31f6";
         miniserver = "enp2s0";
         workstation = "enp5s0";
+        vps = "eth0";
       };
       description = "Set of network interface names for all my computers.";
     };
     mainServer = lib.mkOption {
       type = lib.types.str;
-      default = "miniserver";
+      default = "vps";
       description = "The hostname of the main server.";
     };
     postgresSocket = lib.mkOption {
diff --git a/modules/network/nginx.nix b/modules/network/nginx.nix
index 3cb5ead..5f029a5 100644
--- a/modules/network/nginx.nix
+++ b/modules/network/nginx.nix
@@ -5,44 +5,24 @@
   ...
 }:
 let
-  proxyReverseServices = [
-    "bazarr"
-    "firefox-syncserver"
-    "flame"
-    "flameSecret"
-    "isso"
-    "kavita"
-    "linkwarden"
-    "maloja"
-    "mealie"
-    "metube"
-    "microbin"
-    "multi-scrobbler"
-    "nix-serve"
-    "plausible"
-    "shiori"
-    "vaultwarden"
-    "yamtrack"
-  ];
   proxyReverseFixServices = [
     "atticd"
     "audiobookshelf"
     "gitea"
     "lidarr"
     "ombi"
-    "prowlarr"
     "radarr"
     "sonarr"
-    "stash"
   ];
   proxyReversePrivateServices = [
     "homepage"
+    "prowlarr"
+    "stash"
   ];
   mkServiceConfig =
     type: services: lib.listToAttrs (map (name: lib.nameValuePair name { inherit type; }) services);
   standardProxyServices =
-    (mkServiceConfig "proxyReverse" proxyReverseServices)
-    // (mkServiceConfig "proxyReverseFix" proxyReverseFixServices)
+    (mkServiceConfig "proxyReverseFix" proxyReverseFixServices)
     // (mkServiceConfig "proxyReversePrivate" proxyReversePrivateServices);
   generateProxyConfig =
     serviceName: serviceConfig:
@@ -59,9 +39,21 @@ let
           throw "Unknown proxy type: ${serviceConfig.type}";
     in
     lib.nameValuePair cfg.host (lib.mkIf cfg.enableProxy (proxyFunc cfg));
+  standardProxyNames = builtins.attrNames standardProxyServices;
+  customProxyServices =
+    config.my.servers
+    |> lib.filterAttrs (
+      name: srv:
+      (srv.enableProxy or false)
+      && (srv.useDefaultProxy or true)
+      && !(builtins.elem name standardProxyNames)
+    )
+    |> lib.mapAttrs (_name: _srv: { type = "proxyReverse"; });
 in
 {
   config = lib.mkIf config.my.enableProxy {
-    services.nginx.virtualHosts = lib.mapAttrs' generateProxyConfig standardProxyServices;
+    services.nginx.virtualHosts = lib.mapAttrs' generateProxyConfig (
+      standardProxyServices // customProxyServices
+    );
   };
 }
diff --git a/modules/servers/homepage.nix b/modules/servers/homepage.nix
index 8a63365..bd2f575 100644
--- a/modules/servers/homepage.nix
+++ b/modules/servers/homepage.nix
@@ -9,31 +9,33 @@ let
 in
 {
   options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;
-  config = lib.mkIf config.my.secureHost {
-    sops.secrets = lib.mkIf cfg.enable {
-      homepage.sopsFile = ../../secrets/homepage.yaml;
-      "private-ca/pem" = {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      sops.secrets.homepage.sopsFile = ../../secrets/homepage.yaml;
+      services.homepage-dashboard = {
+        inherit (cfg) enable;
+        listenPort = cfg.port;
+        environmentFile = config.sops.secrets.homepage.path;
+        settings = {
+          providers.openweathermap = "{{HOMEPAGE_VAR_OPENWEATHERMAP_API_KEY}}";
+          layout = import ./homepage/layout.nix;
+        };
+        widgets = import ./homepage/widgets.nix;
+        services = import ./homepage/services.nix { inherit lib config; };
+        bookmarks =
+          builtins.readDir ./homepage/bookmarks
+          |> builtins.attrNames
+          |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+          |> map (file: import ./homepage/bookmarks/${file});
+      };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy && config.my.secureHost) {
+      sops.secrets."private-ca/pem" = {
         sopsFile = ../../secrets/certs.yaml;
         owner = "nginx";
         group = "nginx";
       };
-    };
-    my.servers.homepage.certPath = config.sops.secrets."private-ca/pem".path;
-    services.homepage-dashboard = lib.mkIf cfg.enable {
-      inherit (cfg) enable;
-      listenPort = cfg.port;
-      environmentFile = config.sops.secrets.homepage.path;
-      settings = {
-        providers.openweathermap = "{{HOMEPAGE_VAR_OPENWEATHERMAP_API_KEY}}";
-        layout = import ./homepage/layout.nix;
-      };
-      widgets = import ./homepage/widgets.nix;
-      services = import ./homepage/services.nix { inherit lib config; };
-      bookmarks =
-        builtins.readDir ./homepage/bookmarks
-        |> builtins.attrNames
-        |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
-        |> map (file: import ./homepage/bookmarks/${file});
-    };
-  };
+      my.servers.homepage.certPath = config.sops.secrets."private-ca/pem".path;
+    })
+  ];
 }
diff --git a/modules/servers/jellyfin.nix b/modules/servers/jellyfin.nix
index 7ed6c81..f85c0aa 100644
--- a/modules/servers/jellyfin.nix
+++ b/modules/servers/jellyfin.nix
@@ -23,22 +23,48 @@ let
 in
 {
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;
-  config = lib.mkIf (cfg.enable && config.my.secureHost) {
-    environment.systemPackages = [
-      pkgs.jellyfin-ffmpeg
-    ]
-    ++ (lib.optional cfg.enableCron [ sub-sync-path ]);
-    users.users.jellyfin = {
-      uid = 984;
-      group = "piracy";
-      isSystemUser = true;
-    };
-    services = {
-      jellyfin = {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      environment.systemPackages = [
+        pkgs.jellyfin-ffmpeg
+      ]
+      ++ (lib.optional cfg.enableCron [ sub-sync-path ]);
+      users.users.jellyfin = {
+        uid = 984;
+        group = "piracy";
+        isSystemUser = true;
+      };
+      services.jellyfin = {
         inherit (cfg) enable;
         group = "piracy";
       };
-      nginx = lib.mkIf cfg.enableProxy {
+      systemd = lib.mkIf cfg.enableCron {
+        services.sub-sync = {
+          restartIfChanged = true;
+          description = "syncronizes subtitles downloaded & modified today";
+          wantedBy = [ "default.target" ];
+          path = sub-sync-path;
+          serviceConfig = {
+            Restart = "on-failure";
+            RestartSec = 30;
+            ExecStart = "${sub-sync}/bin/sub-sync all";
+            Type = "simple";
+            User = "root";
+          };
+        };
+        timers.sub-sync = {
+          enable = true;
+          description = "syncronizes subtitles downloaded & modified today";
+          wantedBy = [ "timers.target" ];
+          timerConfig = {
+            OnCalendar = "20:00";
+          };
+        };
+      };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+      my.servers.jellyfin.useDefaultProxy = false;
+      services.nginx = {
         appendHttpConfig = ''
           # JELLYFIN
           proxy_cache_path /var/cache/nginx/jellyfin levels=1:2 keys_zone=jellyfin:100m max_size=15g inactive=1d use_temp_path=off;
@@ -94,29 +120,6 @@ in
           };
         };
       };
-    };
-    systemd = lib.mkIf cfg.enableCron {
-      services.sub-sync = {
-        restartIfChanged = true;
-        description = "syncronizes subtitles downloaded & modified today";
-        wantedBy = [ "default.target" ];
-        path = sub-sync-path;
-        serviceConfig = {
-          Restart = "on-failure";
-          RestartSec = 30;
-          ExecStart = "${sub-sync}/bin/sub-sync all";
-          Type = "simple";
-          User = "root";
-        };
-      };
-      timers.sub-sync = {
-        enable = true;
-        description = "syncronizes subtitles downloaded & modified today";
-        wantedBy = [ "timers.target" ];
-        timerConfig = {
-          OnCalendar = "20:00";
-        };
-      };
-    };
-  };
+    })
+  ];
 }
diff --git a/modules/servers/keycloak.nix b/modules/servers/keycloak.nix
index c7e3e5c..dd6527e 100644
--- a/modules/servers/keycloak.nix
+++ b/modules/servers/keycloak.nix
@@ -10,35 +10,38 @@ let
 in
 {
   options.my.servers.keycloak = setup.mkOptions "keycloak" "auth" 8090;
-  config = lib.mkIf (cfg.enable && config.my.secureHost) {
-    sops.secrets.postgres-password.sopsFile = ../../secrets/secrets.yaml;
-    sops.secrets.keycloak = {
-      sopsFile = ../../secrets/env.yaml;
-      restartUnits = [ "keycloak.service" ];
-    };
-    services.keycloak = {
-      inherit (cfg) enable;
-      database = {
-        type = "postgresql";
-        host = "localhost";
-        createLocally = false;
-        username = "keycloak";
-        name = "keycloak";
-        passwordFile = config.sops.secrets.postgres-password.path;
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      sops.secrets.postgres-password.sopsFile = ../../secrets/secrets.yaml;
+      sops.secrets.keycloak = {
+        sopsFile = ../../secrets/env.yaml;
+        restartUnits = [ "keycloak.service" ];
       };
-      settings = {
-        hostname = cfg.host;
-        hostname-strict = true;
-        hostname-strict-https = false;
-        http-enabled = true;
-        http-port = cfg.port;
-        http-host = cfg.ip;
-        proxy-headers = "xforwarded";
+      services.keycloak = {
+        inherit (cfg) enable;
+        database = {
+          type = "postgresql";
+          host = "localhost";
+          createLocally = false;
+          username = "keycloak";
+          name = "keycloak";
+          passwordFile = config.sops.secrets.postgres-password.path;
+        };
+        settings = {
+          hostname = cfg.host;
+          hostname-strict = true;
+          hostname-strict-https = false;
+          http-enabled = true;
+          http-port = cfg.port;
+          http-host = cfg.ip;
+          proxy-headers = "xforwarded";
+        };
       };
-    };
-    systemd.services.keycloak.serviceConfig.EnvironmentFile = config.sops.secrets.keycloak.path;
-    services.nginx.virtualHosts.${cfg.host} = lib.mkIf (cfg.enableProxy && config.my.enableProxy) (
-      inputs.self.lib.proxyReverseFix cfg
-    );
-  };
+      systemd.services.keycloak.serviceConfig.EnvironmentFile = config.sops.secrets.keycloak.path;
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+      my.servers.keycloak.useDefaultProxy = false;
+      services.nginx.virtualHosts.${cfg.host} = inputs.self.lib.proxyReverseFix cfg;
+    })
+  ];
 }
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index cd2a379..e96c988 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -42,133 +42,137 @@ in
     collabora = setup.mkOptions "collabora" "collabora" 9980;
     go-vod.enable = lib.mkEnableOption "Go-VOD video transcoding service";
   };
-  config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
-    sops.secrets.nextcloud-adminpass = {
-      owner = config.users.users.nextcloud.name;
-      inherit (config.users.users.nextcloud) group;
-    };
-    nixpkgs.config.permittedInsecurePackages = [
-      "nodejs-14.21.3"
-      "openssl-1.1.1v"
-    ];
-    users.groups.nextcloud = { inherit gid; };
-    users.users.nextcloud = {
-      inherit uid;
-      isSystemUser = true;
-      group = "nextcloud";
-      extraGroups = [ "render" ];
-      packages = builtins.attrValues {
-        inherit exiftool pytensorflow;
-        inherit (pkgs)
-          ffmpeg
-          mediainfo
-          nodejs
-          perl
-          ;
+  config = lib.mkMerge [
+    { my.servers.nextcloud.useDefaultProxy = false; }
+    (lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
+      sops.secrets.nextcloud-adminpass = {
+        owner = config.users.users.nextcloud.name;
+        inherit (config.users.users.nextcloud) group;
       };
-    };
-    services = {
-      nextcloud = {
-        enable = true;
-        https = false; # vps
-        package = pkgs.nextcloud32;
-        appstoreEnable = true;
-        configureRedis = true;
-        extraAppsEnable = true;
-        enableImagemagick = true;
-        maxUploadSize = "4096M";
-        hostName = cfg.host;
-        caching = {
-          redis = true;
-          memcached = true;
-          apcu = true;
+      nixpkgs.config.permittedInsecurePackages = [
+        "nodejs-14.21.3"
+        "openssl-1.1.1v"
+      ];
+      users = {
+        groups.nextcloud = { inherit gid; };
+        users.nextcloud = {
+          inherit uid;
+          isSystemUser = true;
+          group = "nextcloud";
+          extraGroups = [ "render" ];
+          packages = builtins.attrValues {
+            inherit exiftool pytensorflow;
+            inherit (pkgs)
+              ffmpeg
+              mediainfo
+              nodejs
+              perl
+              ;
+          };
         };
-        config = {
-          adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
-          dbtype = "pgsql";
-          dbhost = config.my.postgresSocket;
-          dbname = "nextcloud";
-        };
-        phpOptions = {
-          catch_workers_output = "yes";
-          display_errors = "stderr";
-          error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
-          expose_php = "Off";
-          preview_max_x = 2048;
-          preview_max_y = 2048;
-          short_open_tag = "Off";
-          "opcache.enable_cli" = "1";
-          "opcache.fast_shutdown" = "1";
-          "opcache.interned_strings_buffer" = "16";
-          "opcache.jit" = "1255";
-          "opcache.jit_buffer_size" = "256M";
-          "opcache.max_accelerated_files" = "10000";
-          "opcache.huge_code_pages" = "1";
-          "opcache.enable_file_override" = "1";
-          "opcache.memory_consumption" = "256";
-          "opcache.revalidate_freq" = "60";
-          "opcache.save_comments" = "1";
-          "opcache.validate_timestamps" = "0";
-          "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
-        };
-        settings = {
-          log_type = "file";
-          loglevel = 1;
-          trusted_proxies = [
-            config.my.localhost
-            config.my.localhost6
-            config.my.ips.router
-            config.my.ips.wg-vps
+      };
+      services = {
+        nextcloud = {
+          enable = true;
+          https = false; # vps
+          package = pkgs.nextcloud32;
+          appstoreEnable = true;
+          configureRedis = true;
+          extraAppsEnable = true;
+          enableImagemagick = true;
+          maxUploadSize = "4096M";
+          hostName = cfg.host;
+          caching = {
+            redis = true;
+            memcached = true;
+            apcu = true;
+          };
+          config = {
+            adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
+            dbtype = "pgsql";
+            dbhost = config.my.postgresSocket;
+            dbname = "nextcloud";
+          };
+          phpOptions = {
+            catch_workers_output = "yes";
+            display_errors = "stderr";
+            error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
+            expose_php = "Off";
+            preview_max_x = 2048;
+            preview_max_y = 2048;
+            short_open_tag = "Off";
+            "opcache.enable_cli" = "1";
+            "opcache.fast_shutdown" = "1";
+            "opcache.interned_strings_buffer" = "16";
+            "opcache.jit" = "1255";
+            "opcache.jit_buffer_size" = "256M";
+            "opcache.max_accelerated_files" = "10000";
+            "opcache.huge_code_pages" = "1";
+            "opcache.enable_file_override" = "1";
+            "opcache.memory_consumption" = "256";
+            "opcache.revalidate_freq" = "60";
+            "opcache.save_comments" = "1";
+            "opcache.validate_timestamps" = "0";
+            "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
+          };
+          settings = {
+            log_type = "file";
+            loglevel = 1;
+            trusted_proxies = [
+              config.my.localhost
+              config.my.localhost6
+              config.my.ips.router
+              config.my.ips.wg-vps
+            ];
+            trusted_domains = [
+              cfg.host
+              config.my.ips.${config.networking.hostName}
+              "localhost"
+              "cloud.rotehaare.art"
+            ];
+            overwriteprotocol = "https";
+            "overwrite.cli.url" = "${cfg.url}";
+            forwarded_for_headers = [ "HTTP_X_FORWARDED_FOR" ];
+            default_phone_region = "MX";
+            allow_local_remote_servers = true;
+            mail_smtpmode = "sendmail";
+            mail_sendmailmode = "pipe";
+            preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
+            "memories.exiftool" = "${exiftool}/bin/exiftool";
+            "memories.ffmpeg_path" = "${pkgs.ffmpeg}/bin/ffmpeg";
+            "memories.ffprobe_path" = "${pkgs.ffmpeg}/bin/ffprobe";
+            enabledPreviewProviders = [
+              "OC\\Preview\\AVI"
+              "OC\\Preview\\BMP"
+              "OC\\Preview\\GIF"
+              "OC\\Preview\\HEIC"
+              "OC\\Preview\\Image"
+              "OC\\Preview\\JPEG"
+              "OC\\Preview\\Krita"
+              "OC\\Preview\\MKV"
+              "OC\\Preview\\MP3"
+              "OC\\Preview\\MP4"
+              "OC\\Preview\\MarkDown"
+              "OC\\Preview\\Movie"
+              "OC\\Preview\\OpenDocument"
+              "OC\\Preview\\PNG"
+              "OC\\Preview\\TIFF"
+              "OC\\Preview\\TXT"
+              "OC\\Preview\\XBitmap"
+            ];
+          };
+          phpExtraExtensions = all: [
+            all.pdlib
+            all.bz2
           ];
-          trusted_domains = [
-            cfg.host
-            config.my.ips.${config.networking.hostName}
-            "localhost"
+        };
+        nginx.virtualHosts.${cfg.host} = {
+          forceSSL = false;
+          enableACME = false;
+          http2 = false;
+          serverAliases = [
             "cloud.rotehaare.art"
           ];
-          overwriteprotocol = "https";
-          "overwrite.cli.url" = "${cfg.url}";
-          forwarded_for_headers = [ "HTTP_X_FORWARDED_FOR" ];
-          default_phone_region = "MX";
-          allow_local_remote_servers = true;
-          mail_smtpmode = "sendmail";
-          mail_sendmailmode = "pipe";
-          preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
-          "memories.exiftool" = "${exiftool}/bin/exiftool";
-          "memories.ffmpeg_path" = "${pkgs.ffmpeg}/bin/ffmpeg";
-          "memories.ffprobe_path" = "${pkgs.ffmpeg}/bin/ffprobe";
-          enabledPreviewProviders = [
-            "OC\\Preview\\AVI"
-            "OC\\Preview\\BMP"
-            "OC\\Preview\\GIF"
-            "OC\\Preview\\HEIC"
-            "OC\\Preview\\Image"
-            "OC\\Preview\\JPEG"
-            "OC\\Preview\\Krita"
-            "OC\\Preview\\MKV"
-            "OC\\Preview\\MP3"
-            "OC\\Preview\\MP4"
-            "OC\\Preview\\MarkDown"
-            "OC\\Preview\\Movie"
-            "OC\\Preview\\OpenDocument"
-            "OC\\Preview\\PNG"
-            "OC\\Preview\\TIFF"
-            "OC\\Preview\\TXT"
-            "OC\\Preview\\XBitmap"
-          ];
-        };
-        phpExtraExtensions = all: [
-          all.pdlib
-          all.bz2
-        ];
-      };
-      nginx.virtualHosts = {
-        "${cfg.host}" = lib.mkIf cfg.enableProxy {
-          forceSSL = false; # vps
-          enableACME = false; # vps
-          http2 = false; # vps
-          # default = true; #vps
-          #vps
           listen = [
             {
               addr = config.my.ips.wg-server;
@@ -179,7 +183,86 @@ in
               inherit (cfg) port;
             }
           ];
-          #vps
+        };
+      };
+      virtualisation.oci-containers.containers = {
+        go-vod = lib.mkIf config.my.servers.go-vod.enable {
+          autoStart = true;
+          image = "radialapps/go-vod";
+          environment = {
+            TZ = config.my.timeZone;
+            NEXTCLOUD_HOST = "https://${config.services.nextcloud.hostName}";
+            NVIDIA_VISIBLE_DEVICES = "all";
+          };
+          volumes = [ "ncdata:/var/www/html:ro" ];
+          extraOptions = [
+            "--device=/dev/dri" # VA-API (omit for NVENC)
+          ];
+        };
+        collabora = lib.mkIf cfgC.enable {
+          autoStart = true;
+          image = "collabora/code:latest";
+          ports = [ "${toString cfgC.port}:${toString cfgC.port}" ];
+          environment = {
+            TZ = config.my.timeZone;
+            domain = cfg.host;
+            aliasgroup1 = "${cfg.url}:443";
+            aliasgroup2 = "https://cloud.rotehaare.art:443";
+            server_name = cfgC.host;
+            dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
+            extra_params = ''
+              --o:ssl.enable=false
+              --o:ssl.termination=true
+              --o:remote_font_config.url=${cfg.url}/apps/richdocuments/settings/fonts.json
+              --o:logging.level=information
+            '';
+            DONT_GEN_SSL_CERT = "1";
+            SLEEPFORDEBUGGER = "0";
+          };
+          extraOptions = [
+            "--cap-add"
+            "MKNOD"
+          ];
+        };
+      };
+      systemd = lib.mkIf cfg.enableCron {
+        services = {
+          nextcloud-cron.path = [ pkgs.perl ];
+          nextcloud-cronjob =
+            let
+              inherit (inputs.jawz-scripts.packages.x86_64-linux) nextcloud-cronjob;
+            in
+            {
+              description = "Runs various nextcloud-related cronjobs";
+              wantedBy = [ "multi-user.target" ];
+              path = [
+                pkgs.bash
+                nextcloud-cronjob
+              ];
+              serviceConfig = {
+                Restart = "on-failure";
+                RestartSec = 30;
+                ExecStart = "${nextcloud-cronjob}/bin/nextcloud-cronjob";
+              };
+            };
+        };
+        timers.nextcloud-cronjob = {
+          enable = true;
+          description = "Runs various nextcloud-related cronjobs";
+          wantedBy = [ "timers.target" ];
+          timerConfig = {
+            OnCalendar = "*:0/10";
+          };
+        };
+      };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy && config.networking.hostName == "vps") {
+      services.nginx.virtualHosts = {
+        "${cfg.host}" = {
+          forceSSL = true;
+          enableACME = true;
+          http2 = true;
+          default = true;
           serverAliases = [ "cloud.rotehaare.art" ];
           extraConfig = ''
             add_header X-XSS-Protection "1; mode=block" always;
@@ -188,11 +271,16 @@ in
             add_header X-Frame-Options "SAMEORIGIN" always;
             add_header Referrer-Policy "no-referrer-when-downgrade" always;
             add_header X-Permitted-Cross-Domain-Policies "none" always;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
           '';
           locations = {
-            "/".proxyWebsockets = true;
-            "~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|.+/richdocumentscode/proxy).php(?:$|/)" =
-              { };
+            "/" = {
+              proxyPass = cfg.local;
+              proxyWebsockets = true;
+            };
           };
         };
         "${cfgC.host}" = lib.mkIf cfgC.enableProxy {
@@ -243,76 +331,6 @@ in
           };
         };
       };
-    };
-    virtualisation.oci-containers.containers = {
-      go-vod = lib.mkIf config.my.servers.go-vod.enable {
-        autoStart = true;
-        image = "radialapps/go-vod";
-        environment = {
-          TZ = config.my.timeZone;
-          NEXTCLOUD_HOST = "https://${config.services.nextcloud.hostName}";
-          NVIDIA_VISIBLE_DEVICES = "all";
-        };
-        volumes = [ "ncdata:/var/www/html:ro" ];
-        extraOptions = [
-          "--device=/dev/dri" # VA-API (omit for NVENC)
-        ];
-      };
-      collabora = lib.mkIf cfgC.enable {
-        autoStart = true;
-        image = "collabora/code:latest";
-        ports = [ "9980:9980" ];
-        environment = {
-          TZ = config.my.timeZone;
-          domain = cfg.host;
-          aliasgroup1 = "${cfg.url}:443";
-          aliasgroup2 = "https://cloud.rotehaare.art:443";
-          server_name = cfgC.host;
-          dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
-          extra_params = ''
-            --o:ssl.enable=false
-            --o:ssl.termination=true
-            --o:remote_font_config.url=${cfg.url}/apps/richdocuments/settings/fonts.json
-            --o:logging.level=information
-          '';
-          DONT_GEN_SSL_CERT = "1";
-          SLEEPFORDEBUGGER = "0";
-        };
-        extraOptions = [
-          "--cap-add"
-          "MKNOD"
-        ];
-      };
-    };
-    systemd = lib.mkIf cfg.enableCron {
-      services = {
-        nextcloud-cron.path = [ pkgs.perl ];
-        nextcloud-cronjob =
-          let
-            inherit (inputs.jawz-scripts.packages.x86_64-linux) nextcloud-cronjob;
-          in
-          {
-            description = "Runs various nextcloud-related cronjobs";
-            wantedBy = [ "multi-user.target" ];
-            path = [
-              pkgs.bash
-              nextcloud-cronjob
-            ];
-            serviceConfig = {
-              Restart = "on-failure";
-              RestartSec = 30;
-              ExecStart = "${nextcloud-cronjob}/bin/nextcloud-cronjob";
-            };
-          };
-      };
-      timers.nextcloud-cronjob = {
-        enable = true;
-        description = "Runs various nextcloud-related cronjobs";
-        wantedBy = [ "timers.target" ];
-        timerConfig = {
-          OnCalendar = "*:0/10";
-        };
-      };
-    };
-  };
+    })
+  ];
 }
diff --git a/modules/servers/oauth2-proxy.nix b/modules/servers/oauth2-proxy.nix
index 802b0fa..cc84ed4 100644
--- a/modules/servers/oauth2-proxy.nix
+++ b/modules/servers/oauth2-proxy.nix
@@ -40,7 +40,7 @@ in
         secure = true;
         expire = "168h";
         refresh = "1h";
-        domain = ".lebubu.org";
+        domain = ".${config.my.domain}";
         secret = config.sops.secrets.oauth2-proxy-cookie.path;
       };
       extraConfig = {
@@ -53,7 +53,7 @@ in
         session-store-type = "cookie";
         skip-provider-button = true;
         code-challenge-method = "S256";
-        whitelist-domain = [ ".lebubu.org" ];
+        whitelist-domain = [ ".${config.my.domain}" ];
       };
     };
   };
diff --git a/modules/servers/plex.nix b/modules/servers/plex.nix
index 2d761a4..8d64526 100644
--- a/modules/servers/plex.nix
+++ b/modules/servers/plex.nix
@@ -9,51 +9,52 @@ let
 in
 {
   options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;
-  config = lib.mkIf (cfg.enable && config.my.secureHost) {
-    users.users.plex = {
-      uid = 193;
-      group = "piracy";
-      isSystemUser = true;
-    };
-    services = {
-      plex = {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      users.users.plex = {
+        uid = 193;
+        group = "piracy";
+        isSystemUser = true;
+      };
+      services.plex = {
         inherit (cfg) enable;
         group = "piracy";
       };
-      nginx = lib.mkIf cfg.enableProxy {
-        virtualHosts."${cfg.host}" = {
-          forceSSL = true;
-          enableACME = true;
-          http2 = true;
-          serverAliases = [
-            "plex.rotehaare.art"
-          ];
-          extraConfig = ''
-            # Some players don't reopen a socket and playback stops totally instead of resuming after an extended pause
-            send_timeout 100m;
-            # Plex headers
-            proxy_set_header X-Plex-Client-Identifier $http_x_plex_client_identifier;
-            proxy_set_header X-Plex-Device $http_x_plex_device;
-            proxy_set_header X-Plex-Device-Name $http_x_plex_device_name;
-            proxy_set_header X-Plex-Platform $http_x_plex_platform;
-            proxy_set_header X-Plex-Platform-Version $http_x_plex_platform_version;
-            proxy_set_header X-Plex-Product $http_x_plex_product;
-            proxy_set_header X-Plex-Token $http_x_plex_token;
-            proxy_set_header X-Plex-Version $http_x_plex_version;
-            proxy_set_header X-Plex-Nocache $http_x_plex_nocache;
-            proxy_set_header X-Plex-Provides $http_x_plex_provides;
-            proxy_set_header X-Plex-Device-Vendor $http_x_plex_device_vendor;
-            proxy_set_header X-Plex-Model $http_x_plex_model;
-            # Buffering off send to the client as soon as the data is received from Plex.
-            proxy_redirect off;
-            proxy_buffering off;
-          '';
-          locations."/" = {
-            proxyPass = cfg.local;
-            proxyWebsockets = true;
-          };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+      my.servers.plex.useDefaultProxy = false;
+      services.nginx.virtualHosts."${cfg.host}" = {
+        forceSSL = true;
+        enableACME = true;
+        http2 = true;
+        serverAliases = [
+          "plex.rotehaare.art"
+        ];
+        extraConfig = ''
+          # Some players don't reopen a socket and playback stops totally instead of resuming after an extended pause
+          send_timeout 100m;
+          # Plex headers
+          proxy_set_header X-Plex-Client-Identifier $http_x_plex_client_identifier;
+          proxy_set_header X-Plex-Device $http_x_plex_device;
+          proxy_set_header X-Plex-Device-Name $http_x_plex_device_name;
+          proxy_set_header X-Plex-Platform $http_x_plex_platform;
+          proxy_set_header X-Plex-Platform-Version $http_x_plex_platform_version;
+          proxy_set_header X-Plex-Product $http_x_plex_product;
+          proxy_set_header X-Plex-Token $http_x_plex_token;
+          proxy_set_header X-Plex-Version $http_x_plex_version;
+          proxy_set_header X-Plex-Nocache $http_x_plex_nocache;
+          proxy_set_header X-Plex-Provides $http_x_plex_provides;
+          proxy_set_header X-Plex-Device-Vendor $http_x_plex_device_vendor;
+          proxy_set_header X-Plex-Model $http_x_plex_model;
+          # Buffering off send to the client as soon as the data is received from Plex.
+          proxy_redirect off;
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = cfg.local;
+          proxyWebsockets = true;
         };
       };
-    };
-  };
+    })
+  ];
 }
diff --git a/modules/servers/portfolio.nix b/modules/servers/portfolio.nix
deleted file mode 100644
index cc5b8e9..0000000
--- a/modules/servers/portfolio.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  setup = import ../factories/mkserver.nix { inherit lib config; };
-  cfg = config.my.websites.portfolio;
-in
-{
-  options.my.websites.portfolio = setup.mkOptions "portfolio" "portfolio" 0;
-  config.services.nginx.virtualHosts."danilo-reyes.com" = lib.mkIf cfg.enableProxy {
-    forceSSL = true;
-    enableACME = true;
-    http2 = true;
-    root = "/srv/www/danilo-reyes.com";
-    # index = "index.html";
-    locations."/".extraConfig = ''
-      try_files $uri $uri/ =404;
-    '';
-  };
-}
diff --git a/modules/servers/postgres.nix b/modules/servers/postgres.nix
index 1eeb3cd..be0867f 100644
--- a/modules/servers/postgres.nix
+++ b/modules/servers/postgres.nix
@@ -37,6 +37,7 @@ let
     "mealie"
     "nextcloud"
     "paperless"
+    "plausible"
     "shiori"
     "sonarqube"
     "vaultwarden"
diff --git a/modules/servers/prowlarr.nix b/modules/servers/prowlarr.nix
index 53d4df7..5d5eee3 100644
--- a/modules/servers/prowlarr.nix
+++ b/modules/servers/prowlarr.nix
@@ -9,19 +9,29 @@ let
 in
 {
   options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;
-  config = lib.mkIf cfg.enable {
-    users.users.prowlarr = {
-      uid = 987;
-      group = "piracy";
-      isSystemUser = true;
-    };
-    services = {
-      prowlarr = {
-        inherit (cfg) enable;
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      users.users.prowlarr = {
+        uid = 987;
+        group = "piracy";
+        isSystemUser = true;
       };
-      flaresolverr = {
-        inherit (cfg) enable;
+      services = {
+        prowlarr = {
+          inherit (cfg) enable;
+        };
+        flaresolverr = {
+          inherit (cfg) enable;
+        };
       };
-    };
-  };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy && config.my.secureHost) {
+      sops.secrets."private-ca/pem" = {
+        sopsFile = ../../secrets/certs.yaml;
+        owner = "nginx";
+        group = "nginx";
+      };
+      my.servers.prowlarr.certPath = config.sops.secrets."private-ca/pem".path;
+    })
+  ];
 }
diff --git a/modules/servers/stash.nix b/modules/servers/stash.nix
index 285747d..56c1a1c 100644
--- a/modules/servers/stash.nix
+++ b/modules/servers/stash.nix
@@ -29,46 +29,56 @@ let
 in
 {
   options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999;
-  config = lib.mkIf (cfg.enable && config.my.secureHost) {
-    sops.secrets = {
-      "stash/password".sopsFile = ../../secrets/secrets.yaml;
-      "stash/jwt".sopsFile = ../../secrets/secrets.yaml;
-      "stash/session".sopsFile = ../../secrets/secrets.yaml;
-    };
-    services.stash = {
-      inherit (cfg) enable;
-      group = "glue";
-      mutableSettings = true;
-      username = "Suing8150";
-      passwordFile = config.sops.secrets."stash/password".path;
-      jwtSecretKeyFile = config.sops.secrets."stash/jwt".path;
-      sessionStoreKeyFile = config.sops.secrets."stash/session".path;
-      settings = {
-        inherit (cfg) port;
-        host = "0.0.0.0";
-        stash = [
-          {
-            path = "/srv/pool/glue/";
-          }
-        ];
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      sops.secrets = {
+        "stash/password".sopsFile = ../../secrets/secrets.yaml;
+        "stash/jwt".sopsFile = ../../secrets/secrets.yaml;
+        "stash/session".sopsFile = ../../secrets/secrets.yaml;
       };
-    };
-    systemd.services.stash = {
-      environment = {
-        PYTHONPATH = "/var/lib/stash/venv/lib/python3.12/site-packages";
-        LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.glibc}/lib:${pkgs.zlib}/lib:${pkgs.libffi}/lib:${pkgs.openssl}/lib";
+      services.stash = {
+        inherit (cfg) enable;
+        group = "glue";
+        mutableSettings = true;
+        username = "Suing8150";
+        passwordFile = config.sops.secrets."stash/password".path;
+        jwtSecretKeyFile = config.sops.secrets."stash/jwt".path;
+        sessionStoreKeyFile = config.sops.secrets."stash/session".path;
+        settings = {
+          inherit (cfg) port;
+          host = "0.0.0.0";
+          stash = [
+            {
+              path = "/srv/pool/glue/";
+            }
+          ];
+        };
       };
-      serviceConfig = {
-        PrivateUsers = lib.mkForce false;
-        BindReadOnlyPaths = lib.mkForce [ ];
-        BindPaths = lib.mkIf (cfgS.settings != { }) (map (stash: "${stash.path}") cfgS.settings.stash);
+      systemd.services.stash = {
+        environment = {
+          PYTHONPATH = "/var/lib/stash/venv/lib/python3.12/site-packages";
+          LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.glibc}/lib:${pkgs.zlib}/lib:${pkgs.libffi}/lib:${pkgs.openssl}/lib";
+        };
+        serviceConfig = {
+          PrivateUsers = lib.mkForce false;
+          BindReadOnlyPaths = lib.mkForce [ ];
+          BindPaths = lib.mkIf (cfgS.settings != { }) (map (stash: "${stash.path}") cfgS.settings.stash);
+        };
       };
-    };
-    users.users.stash = {
-      uid = 974;
-      isSystemUser = true;
-      group = "glue";
-      packages = [ stashPythonFHS ];
-    };
-  };
+      users.users.stash = {
+        uid = 974;
+        isSystemUser = true;
+        group = "glue";
+        packages = [ stashPythonFHS ];
+      };
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy && config.my.secureHost) {
+      sops.secrets."private-ca/pem" = {
+        sopsFile = ../../secrets/certs.yaml;
+        owner = "nginx";
+        group = "nginx";
+      };
+      my.servers.stash.certPath = config.sops.secrets."private-ca/pem".path;
+    })
+  ];
 }
diff --git a/modules/servers/synapse.nix b/modules/servers/synapse.nix
index 1fa4e44..445a394 100644
--- a/modules/servers/synapse.nix
+++ b/modules/servers/synapse.nix
@@ -25,42 +25,37 @@ in
     synapse = setup.mkOptions "synapse" "pYLemuAfsrzNBaH77xSu" 8008;
     element = setup.mkOptions "element" "55a608953f6d64c199" 5345;
   };
-  config = lib.mkIf (cfg.enable && config.my.secureHost) {
-    my.servers = {
-      synapse = { inherit domain; };
-      element = { inherit domain; };
-    };
-    users.groups.matrix-synapse = { inherit gid; };
-    users.users.matrix-synapse = {
-      inherit uid;
-      isSystemUser = true;
-      group = "matrix-synapse";
-    };
-    sops.secrets = {
-      synapse = {
-        sopsFile = ../../secrets/env.yaml;
-        owner = "matrix-synapse";
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && config.my.secureHost) {
+      my.servers = {
+        synapse = { inherit domain; };
+        element = { inherit domain; };
+      };
+      users.groups.matrix-synapse = { inherit gid; };
+      users.users.matrix-synapse = {
+        inherit uid;
+        isSystemUser = true;
         group = "matrix-synapse";
       };
-      "iqQCY4iAWO-ca/pem" = {
-        sopsFile = ../../secrets/certs.yaml;
-        owner = "nginx";
-        group = "nginx";
+      sops.secrets = {
+        synapse = {
+          sopsFile = ../../secrets/env.yaml;
+          owner = "matrix-synapse";
+          group = "matrix-synapse";
+        };
+        "matrix/key" = {
+          sopsFile = ../../secrets/certs.yaml;
+          owner = "matrix-synapse";
+          group = "matrix-synapse";
+        };
+        "matrix/cert" = {
+          sopsFile = ../../secrets/certs.yaml;
+          owner = "matrix-synapse";
+          group = "matrix-synapse";
+        };
       };
-      "matrix/key" = {
-        sopsFile = ../../secrets/certs.yaml;
-        owner = "matrix-synapse";
-        group = "matrix-synapse";
-      };
-      "matrix/cert" = {
-        sopsFile = ../../secrets/certs.yaml;
-        owner = "matrix-synapse";
-        group = "matrix-synapse";
-      };
-    };
-    networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];
-    services = {
-      matrix-synapse = {
+      networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];
+      services.matrix-synapse = {
         inherit (cfg) enable;
         extraConfigFiles = [
           config.sops.secrets.synapse.path
@@ -100,7 +95,18 @@ in
           ];
         };
       };
-      nginx.virtualHosts = lib.mkIf cfg.enableProxy {
+    })
+    (lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+      sops.secrets."iqQCY4iAWO-ca/pem" = {
+        sopsFile = ../../secrets/certs.yaml;
+        owner = "nginx";
+        group = "nginx";
+      };
+      my.servers.synapse = {
+        useDefaultProxy = false;
+        certPath = config.sops.secrets."iqQCY4iAWO-ca/pem".path;
+      };
+      services.nginx.virtualHosts = {
         "${cfgE.host}" = {
           enableACME = true;
           forceSSL = true;
@@ -125,13 +131,8 @@ in
             "/_matrix".proxyPass = "http://[${config.my.localhost6}]:${toString cfg.port}";
             "/_synapse/client".proxyPass = "http://[${config.my.localhost6}]:${toString cfg.port}";
           };
-          # extraConfig = ''
-          #   ssl_verify_client on;
-          #   ssl_client_certificate ${config.sops.secrets."iqQCY4iAWO-ca/pem".path};
-          #   error_page 403 /403.html;
-          # '';
         };
       };
-    };
-  };
+    })
+  ];
 }
diff --git a/modules/services/wireguard.nix b/modules/services/wireguard.nix
index 505f829..3af3905 100644
--- a/modules/services/wireguard.nix
+++ b/modules/services/wireguard.nix
@@ -1,51 +1,48 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
   port = 51820;
-  interface = config.my.interfaces.${config.networking.hostName};
 in
 {
   options.my.services.wireguard.enable = lib.mkEnableOption "WireGuard VPN configuration";
   config = lib.mkIf (config.my.services.wireguard.enable && config.my.secureHost) {
-    sops.secrets."wireguard/private".sopsFile = ../../secrets/wireguard.yaml;
+    sops.secrets."vps/server/private".sopsFile = ../../secrets/wireguard.yaml;
     networking = {
       firewall.allowedUDPPorts = [ port ];
-      nat = {
-        enable = true;
-        externalInterface = interface;
-        internalInterfaces = [ "wg0" ];
-      };
       wireguard.interfaces.wg0 = {
-        ips = [ "10.100.0.1/24" ];
+        ips = [
+          config.my.wgInterfaces.wg-homelab
+          config.my.wgInterfaces.wg-friends
+          config.my.wgInterfaces.wg-guests
+        ];
         listenPort = port;
-        postSetup = ''
-          ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o ${interface} -j MASQUERADE
-        '';
-        postShutdown = ''
-          ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o ${interface} -j MASQUERADE
-        '';
-        privateKeyFile = config.sops.secrets."wireguard/private".path;
+        postSetup = "";
+        postShutdown = "";
+        privateKeyFile = config.sops.secrets."vps/server/private".path;
         peers = [
           {
-            publicKey = "ciupBjCcIpd3K5vlzNMJC8iiyNqB9xXwkSC6UXPKP3g=";
-            allowedIPs = [ "10.100.0.2/32" ];
-          } # phone
+            publicKey = "OUiqluRaS4hmGvLJ3csQrnIM3Zzet50gsqtTABaUkH4=";
+            allowedIPs = [ "${config.my.ips.wg-server}/32" ];
+          }
           {
-            publicKey = "JgeA1ElDwR7oLmyGn8RzvxiscMBhR8+L+mEjY1Cq7gk=";
-            allowedIPs = [ "10.100.0.3/32" ];
-          } # tablet
+            publicKey = "rFgT6TXzRazK6GMazMNGjtOvzAAPST0LvCfN7QXsLho=";
+            allowedIPs = [ "${config.my.ips.wg-friend1}/32" ];
+          }
           {
-            publicKey = "giPVRUTLtqPGb57R4foGZMNS0tjIp2ry6lMKYtqHjn4=";
-            allowedIPs = [ "10.100.0.15/32" ];
-          } # jeancarlos
+            publicKey = "R1CTx5+CXivMI6ZEmRYsyFUFILhe6Qnub0iEIRvvrEY=";
+            allowedIPs = [ "${config.my.ips.wg-friend2}/32" ];
+          }
           {
-            publicKey = "92JdW/NExg1tUE4cEyl6Yn+0Eex+iFVA37ahPRhRnRM=";
-            allowedIPs = [ "10.100.0.16/32" ];
-          } # gorilia
+            publicKey = "ecPNSacD6yVwpnLBs171z0xkw9M1DXKh/Kn70cIBcwA=";
+            allowedIPs = [ "${config.my.ips.wg-friend3}/32" ];
+          }
+          {
+            publicKey = "yg+2miZCrx89znFaUlU/le/7UIPgEAMY74fZfEwz8g4=";
+            allowedIPs = [ "${config.my.ips.wg-friend4}/32" ];
+          }
         ];
       };
     };
diff --git a/modules/websites/lidarr-mb-report.nix b/modules/websites/lidarr-mb-report.nix
new file mode 100644
index 0000000..637fa75
--- /dev/null
+++ b/modules/websites/lidarr-mb-report.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.my.websites.lidarrMbReport;
+  mbSecurityHeaders = ''
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+  '';
+in
+{
+  options.my.websites.lidarrMbReport = {
+    enableProxy = lib.mkEnableOption "lidarr mb report static site";
+  };
+  config = lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+    services.nginx.virtualHosts."mb-report.lebubu.org" = {
+      forceSSL = true;
+      enableACME = true;
+      root = "/var/www/html/lidarr-mb-gap";
+      locations = {
+        "/" = {
+          extraConfig = ''
+            try_files $uri /missing_albums.html;
+            ${mbSecurityHeaders}
+          '';
+        };
+        "~* \\.html$" = {
+          extraConfig = ''
+            add_header Content-Type "text/html; charset=utf-8";
+            ${mbSecurityHeaders}
+          '';
+        };
+        "~* \\.json$" = {
+          extraConfig = ''
+            add_header Content-Type "application/json";
+            ${mbSecurityHeaders}
+          '';
+        };
+      };
+    };
+  };
+}
diff --git a/modules/websites/portfolio.nix b/modules/websites/portfolio.nix
new file mode 100644
index 0000000..222fe7b
--- /dev/null
+++ b/modules/websites/portfolio.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.my.websites.portfolio;
+  issoCfg = config.my.servers.isso;
+  hugoSecurityHeaders = ''
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+    add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+  '';
+  hugoLocations = {
+    "/" = {
+      extraConfig = ''
+        try_files $uri $uri/ /index.html;
+        ${hugoSecurityHeaders}
+      '';
+    };
+    "~* \\.html$" = {
+      extraConfig = ''
+        try_files $uri $uri/ /index.html;
+        ${hugoSecurityHeaders}
+      '';
+    };
+    "~* \\.(jpg|jpeg|png|gif|ico|css|js|svg|woff|woff2|ttf|xml)$" = {
+      extraConfig = ''
+        expires 1y;
+        add_header Cache-Control "public, max-age=31536000, immutable";
+        ${hugoSecurityHeaders}
+      '';
+    };
+    "~ /\\.(?!well-known).*" = {
+      extraConfig = ''
+        return 404;
+        ${hugoSecurityHeaders}
+      '';
+    };
+    "= /js/script.js" = {
+      proxyPass = "https://analytics.lebubu.org";
+      extraConfig = ''
+        proxy_set_header Host analytics.lebubu.org;
+        rewrite ^ /js/script.file-downloads.hash.outbound-links.js break;
+        ${hugoSecurityHeaders}
+      '';
+    };
+    "= /api/event" = {
+      proxyPass = "https://analytics.lebubu.org";
+      extraConfig = ''
+        proxy_set_header Host analytics.lebubu.org;
+        ${hugoSecurityHeaders}
+      '';
+    };
+  };
+in
+{
+  options.my.websites.portfolio = {
+    enableProxy = lib.mkEnableOption "portfolio and blog static sites";
+  };
+  config = lib.mkIf (cfg.enableProxy && config.my.enableProxy) {
+    services.nginx.virtualHosts = {
+      "www.danilo-reyes.com" = {
+        forceSSL = true;
+        enableACME = true;
+        globalRedirect = "danilo-reyes.com";
+      };
+      "www.blog.danilo-reyes.com" = {
+        forceSSL = true;
+        enableACME = true;
+        globalRedirect = "blog.danilo-reyes.com";
+      };
+      "danilo-reyes.com" = {
+        forceSSL = true;
+        enableACME = true;
+        root = "/var/www/html/portfolio";
+        locations = hugoLocations;
+      };
+      "blog.danilo-reyes.com" = {
+        forceSSL = true;
+        enableACME = true;
+        root = "/var/www/html/blog";
+        locations = hugoLocations // {
+          "^~ /isso" = {
+            proxyPass = "http://${issoCfg.ip}:${toString issoCfg.port}";
+            extraConfig = ''
+              rewrite ^/isso/?(.*)$ /$1 break;
+              proxy_set_header Host $host;
+              ${hugoSecurityHeaders}
+            '';
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/parts/core.nix b/parts/core.nix
index 6d62eb3..c7f25e0 100644
--- a/parts/core.nix
+++ b/parts/core.nix
@@ -196,6 +196,13 @@ in
           inherit ip;
         };
       };
+      mkEnabledProxyIp = ip: name: {
+        inherit name;
+        value = {
+          enableProxy = true;
+          inherit ip;
+        };
+      };
       enableList = func: list: list |> map func |> builtins.listToAttrs;
       mkPostgresDependency = config: serviceName: displayName: {
         assertion = config.my.servers.${serviceName}.enable -> config.my.servers.postgres.enable;
@@ -217,7 +224,6 @@ in
         nixworkstation = ../secrets/ssh/ed25519_nixworkstation.pub;
         nixserver = ../secrets/ssh/ed25519_nixserver.pub;
         nixminiserver = ../secrets/ssh/ed25519_nixminiserver.pub;
-        windows_vm = ../secrets/ssh/ed25519_windows_vm.pub;
       };
       getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
       # Helper functions for multi-user toggle support
diff --git a/secrets/ssh/ed25519_deploy.pub b/secrets/ssh/ed25519_deploy.pub
new file mode 100644
index 0000000..4593ffc
--- /dev/null
+++ b/secrets/ssh/ed25519_deploy.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6scNSRnOprOvqm5DSTSMORvh9c5z0S1GzX1D7u+gMw deploy@portfolio
diff --git a/secrets/ssh/ed25519_lidarr-reports.pub b/secrets/ssh/ed25519_lidarr-reports.pub
new file mode 100644
index 0000000..214c3ff
--- /dev/null
+++ b/secrets/ssh/ed25519_lidarr-reports.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbCQ/f117hL7Z02Vog1RCaOVUi95beYf//Qppnqf2Ha lidarr-reports@lidarr-reports
diff --git a/secrets/wireguard.yaml b/secrets/wireguard.yaml
index 10cfc70..12da0ab 100644
--- a/secrets/wireguard.yaml
+++ b/secrets/wireguard.yaml
@@ -5,6 +5,7 @@ vps:
     server:
         private: ENC[AES256_GCM,data:wrP/069tuQs3ObYE8Q0MNVxe3+4vZ2HIImoIdZpj1uPgdBknboX1wmANv/k=,iv:FJL5KumHos8PoXra+BB2Uc6YedsF6MD3wWyuugXzJ+E=,tag:nVuTrW2P7JvnWnv6H1SmdQ==,type:str]
         public: ENC[AES256_GCM,data:YnKOf9725v9FkzdNPDVf/iinMbY/YWn6ksqEz+mpB4KHVlOvpbV6vLSKRcs=,iv:aWQNy6mT4sxVbzaXKgRzZ9XVsiBCRsOlLORRqC+uiKE=,tag:mLWv6mr3VVfw0J5BrqByXg==,type:str]
+    #ENC[AES256_GCM,data:u5SEQfK0Hw==,iv:+qr9WmOzQowZ/JyN1KoWhoyHA2132fmmZzIQy7o5y6k=,tag:9TPVeQgoo2nWQ9dhuYULGw==,type:comment]
     home:
         private: ENC[AES256_GCM,data:YZ0jvBzkMv8Bwc9u3LDJzwSqQvPj8wPUxTIeBFiLYVQQIBjm8aS1dTYuPvo=,iv:mXuW7TVERxOMmGIit3a7Spmbk/EgYuGkO66AWJUnMF0=,tag:xM7C3F3JCiud/A9yPD5ydQ==,type:str]
         public: ENC[AES256_GCM,data:DcwAHhHjIxFqRL5h7p/0nkFnWiI/iqR8Fws6AuFaxjgUHKYd/6l3D6q/O/0=,iv:bBJ0bsKRiGQUSlRmHqeLQWkOIUNfG5VVpuV6MOtKZO0=,tag:harMG6GDIfclmSq3D36bTw==,type:str]
@@ -46,7 +47,7 @@ sops:
             SG40OS8wMHlKNmxQa0VScHQrU2NmT2sKt9xw/8jsgnV1cZndqYNiHvIf8VdEJYCl
             UUJ1KPz9mvUx3ny+rK50FSD61U8PHEZm2UC0w+/qkZwRtCx21Ku6dw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-08T00:14:52Z"
-    mac: ENC[AES256_GCM,data:O2herKRy4k9ZMuPzzPF5QlBC2isXdRoIsbYLJ/6X7esxtxxgNuAljx4SCR6UMT7pl3G2E33cnnBEkuAIy6SMXOaZNfOuAEJXaCwpRwCXu26lrcTf6n7UdP36GWfIRsR4utD5/vv66ch6MqmQWkW7E5zydy5dOv+BJ4XS/50OUQs=,iv:TscYNQaeI+mBxyobxI1O4wUzRtA27pvjXz27kqMJhA0=,tag:zx/xrYAWJCxYz5HRTKzYfQ==,type:str]
+    lastmodified: "2026-02-04T18:37:11Z"
+    mac: ENC[AES256_GCM,data:AlrMK34dWDm5hfVwnQnzk3l8NIRbiVV6KHa6io9S9l07WvC3TYLTOJS6xOi4pkEz6sqQ7IpZU7RRdosxuQp50NmMEt2QYawTHFZIgzFYeKRbl5N5LCu9afC6yTtvG/sT7uenTMhh2qT1JBwebJiUdM9zNVUzWlW5d1SdxrHgIbs=,iv:dvqsDaC+trhY1kheYUEOEwHfCDz0Mu7N0LpfjnKko5g=,tag:tuqyK8vuwSrk1kf+Vi7MKg==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.11.0
diff --git a/specs/004-vps-migration/checklists/requirements.md b/specs/004-vps-migration/checklists/requirements.md
new file mode 100644
index 0000000..ce76831
--- /dev/null
+++ b/specs/004-vps-migration/checklists/requirements.md
@@ -0,0 +1,34 @@
+# Specification Quality Checklist: VPS Migration
+
+**Purpose**: Validate specification completeness and quality before proceeding to planning  
+**Created**: 2026-02-04  
+**Feature**: /home/jawz/Development/NixOS/specs/004-vps-migration/spec.md
+
+## Content Quality
+
+- [x] No implementation details (languages, frameworks, APIs)
+- [x] Focused on user value and business needs
+- [x] Written for non-technical stakeholders
+- [x] All mandatory sections completed
+
+## Requirement Completeness
+
+- [x] No [NEEDS CLARIFICATION] markers remain
+- [x] Requirements are testable and unambiguous
+- [x] Success criteria are measurable
+- [x] Success criteria are technology-agnostic (no implementation details)
+- [x] All acceptance scenarios are defined
+- [x] Edge cases are identified
+- [x] Scope is clearly bounded
+- [x] Dependencies and assumptions identified
+
+## Feature Readiness
+
+- [x] All functional requirements have clear acceptance criteria
+- [x] User scenarios cover primary flows
+- [x] Feature meets measurable outcomes defined in Success Criteria
+- [x] No implementation details leak into specification
+
+## Notes
+
+- All checks passed on first review.
diff --git a/specs/004-vps-migration/contracts/openapi.yaml b/specs/004-vps-migration/contracts/openapi.yaml
new file mode 100644
index 0000000..a73d262
--- /dev/null
+++ b/specs/004-vps-migration/contracts/openapi.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.3
+info:
+  title: VPS Migration Verification API
+  version: 0.1.0
+  description: |
+    Optional verification endpoints for migration validation. These describe
+    checks that can be automated; if no API is implemented, treat as a checklist.
+paths:
+  /verify/proxy:
+    get:
+      summary: Verify reverse proxy routing to host services
+      responses:
+        "200":
+          description: Proxy mappings resolve to services on host server
+  /verify/firewall:
+    get:
+      summary: Verify nftables parity against the iptables reference
+      responses:
+        "200":
+          description: Firewall flows match expected allow/deny behavior
+  /verify/vpn:
+    get:
+      summary: Verify VPN peer connectivity and address assignment
+      responses:
+        "200":
+          description: All peers connect with correct addresses
+  /verify/ssh:
+    get:
+      summary: Verify SSH access for authorized principals
+      responses:
+        "200":
+          description: Authorized keys allow expected access only
+  /verify/analytics:
+    get:
+      summary: Verify analytics data migrated successfully
+      responses:
+        "200":
+          description: Historical analytics data present on new server
diff --git a/specs/004-vps-migration/data-model.md b/specs/004-vps-migration/data-model.md
new file mode 100644
index 0000000..1e4a30e
--- /dev/null
+++ b/specs/004-vps-migration/data-model.md
@@ -0,0 +1,41 @@
+# Data Model: VPS Migration
+
+## Host
+
+- **Fields**: name, role (primary/secondary), publicIp, vpnEndpoint, services[], proxyMappings[], firewallRuleSet
+- **Rules**: Exactly one primary host for reverse proxying.
+
+## Service
+
+- **Fields**: name, enabled, runsOnHost, proxyEnabled, domains[]
+- **Rules**: Services remain on host server; proxyEnabled true on VPS for all enabled services.
+
+## ProxyMapping
+
+- **Fields**: domain, targetService, tlsRequired
+- **Rules**: domain must be unique across mappings; domain must match service definitions.
+
+## FirewallRuleSet
+
+- **Fields**: sourceFile (iptables reference), rules[], appliedHost
+- **Rules**: Ruleset must be applied as-is; no translation allowed.
+
+## VPNPeer
+
+- **Fields**: name, publicKeyRef, allowedIps[]
+- **Rules**: allowedIps must be unique across peers; publicKeyRef must resolve via secrets system.
+
+## VPNInterface
+
+- **Fields**: addressRanges[], listenPort, privateKeyRef
+- **Rules**: privateKeyRef stored in secrets system; listenPort exposed on VPS.
+
+## ServiceUser
+
+- **Fields**: username, group, authorizedKeys[]
+- **Rules**: deploy uses ed25519_deploy.pub; lidarr-reports uses ed25519_lidarr-reports.pub.
+
+## MigrationChecklistItem
+
+- **Fields**: task, verificationStep, status
+- **Rules**: each migration task must have a verification step.
diff --git a/specs/004-vps-migration/plan.md b/specs/004-vps-migration/plan.md
new file mode 100644
index 0000000..eafe9a7
--- /dev/null
+++ b/specs/004-vps-migration/plan.md
@@ -0,0 +1,52 @@
+# Implementation Plan: VPS Migration
+
+**Branch**: `004-vps-migration` | **Date**: 2026-02-04 | **Spec**: /home/jawz/Development/NixOS/specs/004-vps-migration/spec.md
+**Input**: Feature specification from `/specs/004-vps-migration/spec.md`
+
+## Summary
+
+Migrate VPS responsibilities to the new NixOS host by making it the primary reverse-proxy host (nginx only), mirroring the existing iptables ruleset via nftables/NixOS equivalents, enabling wireguard with secret-managed keys, and restoring SSH/service-user access, while keeping all services running on the host server. Provide validation steps, review historical configs for gaps, and document analytics data migration.
+
+## Technical Context
+
+**Language/Version**: Nix (flakes; nixpkgs 25.11)  
+**Primary Dependencies**: NixOS modules, sops-nix, nginx, wireguard, openssh, nftables (iptables reference)  
+**Storage**: Files (configuration and secrets)  
+**Testing**: Manual validation steps (no automated test harness)  
+**Target Platform**: Linux server (NixOS)  
+**Project Type**: configuration repo  
+**Performance Goals**: N/A (configuration change)  
+**Constraints**: Services remain on host server; VPS only terminates proxy and exposes wireguard port; nftables parity required  
+**Scale/Scope**: Single VPS + host server, small set of VPN peers and admin SSH principals
+
+## Constitution Check
+
+No enforceable constitution rules are defined (placeholders only). Gate passes by default.
+
+Post-design check: unchanged (no enforceable gates found).
+
+## Project Structure
+
+### Documentation (this feature)
+
+```text
+specs/004-vps-migration/
+├── plan.md
+├── research.md
+├── data-model.md
+├── quickstart.md
+├── contracts/
+└── tasks.md
+```
+
+### Source Code (repository root)
+
+```text
+hosts/
+modules/
+secrets/
+iptables (reference ruleset)
+scripts/
+```
+
+**Structure Decision**: Use the existing NixOS configuration layout (`hosts/`, `modules/`, `secrets/`) and the root `iptables` ruleset file as the reference for nftables parity.
diff --git a/specs/004-vps-migration/quickstart.md b/specs/004-vps-migration/quickstart.md
new file mode 100644
index 0000000..6e572c0
--- /dev/null
+++ b/specs/004-vps-migration/quickstart.md
@@ -0,0 +1,107 @@
+# Quickstart: VPS Migration
+
+## Prerequisites
+
+- Access to this repo and the new VPS host configuration
+- Existing iptables ruleset file available at repo root (reference for nftables parity): `iptables`
+- VPN keys present in the secrets system
+- SSH public keys present in `secrets/ssh/`
+
+## Steps
+
+1. Review the spec and clarifications:
+   - `/home/jawz/Development/NixOS/specs/004-vps-migration/spec.md`
+
+2. Ensure secrets are available:
+   - VPN private/public keys are stored in the secrets system
+   - `secrets/ssh/ed25519_deploy.pub` and `secrets/ssh/ed25519_lidarr-reports.pub` exist
+
+3. Update host configuration:
+   - Set new VPS as primary reverse proxy host
+   - Enable proxying for all enabled services (services remain on host server)
+   - Apply nftables/NixOS firewall rules derived from the iptables reference
+   - Enable wireguard on VPS and expose port
+   - Add service users and admin SSH keys
+   - Update VPS public IP to `45.33.0.228` in SSH configuration
+   - Update host server VPN client to target the new VPS
+
+4. Provide and review legacy proxy config snapshot:
+   - Supply caddy files for subdomain comparison
+   - Treat caddy as migration input only; nginx is the only proxy target for NixOS runtime
+
+## Caddy vs Nix Subdomain Comparison (from provided caddy/ directory)
+
+**Caddy-only domains (present in caddy, not found in current Nix server hosts):**
+- danilo-reyes.com
+- www.danilo-reyes.com
+- blog.danilo-reyes.com
+- www.blog.danilo-reyes.com
+- mb-report.lebubu.org
+- torrent.lebubu.org
+
+**Nix-only domains (present in Nix server hosts, not in caddy config):**
+- auth-proxy.lebubu.org
+- comments.danilo-reyes.com
+- flix.rotehaare.art
+- 55a608953f6d64c199.lebubu.org
+- pYLemuAfsrzNBaH77xSu.lebubu.org
+- bookmarks.lebubu.org
+- drpp.lebubu.org
+- portfolio.lebubu.org
+- qampqwn4wprhqny8h8zj.lebubu.org
+- requests.lebubu.org
+- start.lebubu.org
+- sync.lebubu.org
+- tranga.lebubu.org
+
+**Notes:**
+- `auth-proxy.lebubu.org` appears only in `15-private.caddyfile__` (not imported by Caddy), so it is currently inactive in caddy.
+- `danilo-reyes.com` and `blog.danilo-reyes.com` are handled as static sites in caddy; Nix has `my.websites.portfolio` and `isso` which may need mapping to these domains.
+- `mb-report.lebubu.org` and `torrent.lebubu.org` are present in caddy but no matching Nix server host was found.
+
+5. Migrate analytics data:
+   - Identify the analytics system (e.g., Plausible) and its data store location or database
+   - Freeze writes during export (stop the analytics service or enable maintenance mode)
+   - Export analytics data from the existing server (db dump or data directory archive)
+   - Transfer the export to the new server using the secure path already used for secrets/config
+   - Import the data on the new server and restart the analytics service
+   - Validate historical data is present (date range coverage, dashboard counts, and sample events)
+
+6. Run verification steps for each task (per spec FR-012).
+
+## Clarification Candidates From History Review
+
+- `opentracker` was installed and enabled (`systemctl enable --now opentracker`) with firewall rules for TCP/UDP `6969`; confirm if tracker service is still required on NixOS.
+- `ip6tables` was enabled on Fedora (`systemctl enable ip6tables`); confirm if equivalent IPv6 policy is required on VPS.
+- `net.ipv4.conf.wg0.rp_filter=0` was set during forwarding troubleshooting; confirm if this sysctl needs to be persisted on VPS.
+- Fedora-specific SELinux SSH port handling (`semanage ssh_port_t`) appears in history; confirm it can remain excluded on NixOS.
+
+## Verification Steps
+
+- **T001**: `test -f ./iptables && test -f ./secrets/ssh/ed25519_deploy.pub && test -f ./secrets/ssh/ed25519_lidarr-reports.pub && test -f ./secrets/wireguard.yaml`
+- **T002**: verify this section exists in `/home/jawz/Development/NixOS/specs/004-vps-migration/quickstart.md`
+- **T003**: `rg -n "mainServer|enableProxy" hosts/server/toggles.nix modules/modules.nix`
+- **T004**: `rg -n "wireguard|wg0|services.wireguard" modules/services/wireguard.nix hosts/vps/configuration.nix`
+- **T005**: `rg -n "vps|45.33.0.228|programs.ssh" config/jawz.nix modules/modules.nix`
+- **T006**: `rg -n "/etc/caddy/Caddyfile.d" sudo_hist jawz_hist`
+- **T007**: `rg -n 'mainServer = "vps"' hosts/server/toggles.nix modules/modules.nix`
+- **T008**: `rg -n "enableProxy = true" hosts/vps/toggles.nix hosts/vps/configuration.nix hosts/server/toggles.nix`
+- **T009**: ensure Caddy vs Nix comparison section remains in this file
+- **T010**: `rg -n "iqQCY4iAWO-ca/pem|certPath|proxyReversePrivate" modules/network/nginx.nix modules/servers`
+- **T011**: `rg -n "nftables|forwardPorts|vps-snat" hosts/vps/configuration.nix`
+- **T012**: `rg -n "services.wireguard.enable = true" hosts/vps/configuration.nix`
+- **T013**: confirm `wireguard/private` exists in `secrets/wireguard.yaml`
+- **T014**: `rg -n "10.77.0.1/24|10.8.0.1/24|10.9.0.1/24|AllowedIPs|allowedIPs" modules/services/wireguard.nix`
+- **T015**: `rg -n "users\\.deploy|users\\.lidarr-reports|ed25519_deploy|ed25519_lidarr-reports" hosts/vps/configuration.nix`
+- **T016**: `rg -n "workstation|server|deacero|galaxy" hosts/vps/configuration.nix`
+- **T017**: `rg -n "ports = \\[ 3456 \\]|PermitRootLogin = \"no\"" hosts/vps/configuration.nix`
+- **T018**: `rg -n "sudo-rs\\.extraRules|nixos-rebuild|nixremote" hosts/vps/configuration.nix`
+- **T019**: `rg -n "nixworkstation" hosts/vps/configuration.nix`
+- **T020**: `rg -n "45\\.33\\.0\\.228" modules/modules.nix config/jawz.nix`
+- **T021**: `rg -n "endpoint = .*my\\.ips\\.vps" hosts/server/configuration.nix`
+- **T022**: verify "Clarification Candidates From History Review" section exists in this file
+- **T023**: `rg -n "Migrate analytics data|Export analytics|Import.*analytics|Validate historical data" /home/jawz/Development/NixOS/specs/004-vps-migration/quickstart.md`
+- **T024**: verify each task from T001-T026 has a corresponding verification line in this section
+- **T025**: `rg -n "caddy|Caddy" README.org docs || true` and confirm no active-proxy references remain outside legacy migration notes
+- **T026**: `rg -n "T0[0-2][0-9]" /home/jawz/Development/NixOS/specs/004-vps-migration/tasks.md` and confirm each task mentions at least one concrete path
+- **T027**: `rg -n "modules/websites|danilo-reyes.com|blog.danilo-reyes.com|mb-report.lebubu.org" modules/websites hosts/vps/toggles.nix`
diff --git a/specs/004-vps-migration/research.md b/specs/004-vps-migration/research.md
new file mode 100644
index 0000000..51a446c
--- /dev/null
+++ b/specs/004-vps-migration/research.md
@@ -0,0 +1,31 @@
+# Research: VPS Migration
+
+## Decision 1: Reverse proxy role
+
+- **Decision**: New VPS runs nginx as the primary reverse proxy; services remain on the host server.
+- **Rationale**: Matches the clarified scope and minimizes service migration risk while restoring proxy functionality.
+- **Alternatives considered**: Migrating services to VPS; keeping old proxy (caddy) on Fedora VPS.
+
+## Decision 2: Firewall parity
+
+- **Decision**: Use the existing iptables ruleset as the source of truth and implement equivalent nftables/NixOS rules on the new VPS.
+- **Rationale**: Ensures exact behavioral parity for complex routing and hot-swap behavior.
+- **Alternatives considered**: Translating to another firewall system; partial translation with mixed rules.
+
+## Decision 3: VPN key handling
+
+- **Decision**: Store VPN keys only in the existing secrets system; no plaintext keys in config.
+- **Rationale**: Preserves confidentiality and aligns with encrypted secrets workflow.
+- **Alternatives considered**: Plaintext inline keys; separate unmanaged secrets store.
+
+## Decision 4: Admin SSH principals
+
+- **Decision**: Limit admin SSH authorized_keys entries to workstation, server, deacero, and galaxy.
+- **Rationale**: Keeps access scope bounded to explicitly requested principals.
+- **Alternatives considered**: Auto-adding other hosts found in config; adding only after confirmation.
+
+## Decision 5: Analytics (Plausible) migration
+
+- **Decision**: Migrate existing analytics data to the new server.
+- **Rationale**: Preserves historical reporting and continuity of metrics.
+- **Alternatives considered**: Fresh start with no history; read-only legacy instance for history.
diff --git a/specs/004-vps-migration/spec.md b/specs/004-vps-migration/spec.md
new file mode 100644
index 0000000..dc069f8
--- /dev/null
+++ b/specs/004-vps-migration/spec.md
@@ -0,0 +1,177 @@
+# Feature Specification: VPS Migration
+
+**Feature Branch**: `004-vps-migration`  
+**Created**: 2026-02-04  
+**Status**: Draft  
+**Input**: User description: "start feature branch 004, the git fetch command will fail, so force 004. Feature 003 added a new hosts vps, as a linode host, I want to now fully migrate my existing fedora vps to this new nixos vps. to do so I want to bring in the configurations fedora vps has. 1. right now the nginx logic of my servers is disabled, because I let the fedora vps handle the reverse proxy through caddy. But I dont want that caddy logic, on nixos I want to let nginx take care of the reverse proxies, plus the logic is already backed in, there is a isLocal logic to the factory, and I dont remember exactly the name of the code. but there is some flag under the my. options that specifies the mainHost, the constitution mentions that mainHost is the host handling nginx and because the vps will be it, then main host needs to become vps, I think before it was miniserver. This change means, that all the currently enabled servers on the toggles.nix from the host server, should have the enableProxy flag on vps (double check the logic) this should make it so, that nginx runs on vps, and the servers run on server. 2. Add a step to ask me for the caddy files, just to check that the subdomains caddy handles for each server match the subdomains on the servers/.*nix files. 3. I use iptables on the fedora vps, and the nixos vps, well I dont mind you using another firewall but there are some complex firewall rules that I need them to work 100% as the original vps, the rules will be on a file named iptables (treat this as the reference ruleset for nftables parity), this is perhaps the most important step, otherwise the complex network configuration this vps has wont be able to hot swap and serve my servers to the world.
+
+4. modify the existing wireguard.nix module, doublecheck that isnt toggled anywhere, toggle it on vps and add this configuration to it
+[Interface]
+#DNS = 10.77.0.1
+Address = 10.77.0.1/24, 10.8.0.1/24, 10.9.0.1/24
+ListenPort = 51820
+PrivateKey = aDQHN3DfAGEFjVHRKIJ34CJKPcKx7HdYzkEbRNBNWGw=
+
+# me
+[Peer]
+PublicKey = OUiqluRaS4hmGvLJ3csQrnIM3Zzet50gsqtTABaUkH4=
+AllowedIPs = 10.77.0.2/32
+
+# friends
+[Peer] # 7351
+PublicKey = rFgT6TXzRazK6GMazMNGjtOvzAAPST0LvCfN7QXsLho=
+AllowedIPs = 10.8.0.2/32
+[Peer]
+PublicKey = R1CTx5+CXivMI6ZEmRYsyFUFILhe6Qnub0iEIRvvrEY=
+AllowedIPs = 10.8.0.3/32
+[Peer]
+PublicKey = ecPNSacD6yVwpnLBs171z0xkw9M1DXKh/Kn70cIBcwA=
+AllowedIPs = 10.8.0.4/32
+[Peer]
+PublicKey = yg+2miZCrx89znFaUlU/le/7UIPgEAMY74fZfEwz8g4=
+AllowedIPs = 10.8.0.5/32
+
+# # gooners
+# [Peer]
+# PublicKey = GawtOvsZ75avelIri5CjGoPXd8AFpi9qlZ6dSsqUISE=
+# AllowedIPs = 10.77.0.2/32, 10.9.0.2/32
+
+can I use sops to encrypt the public and private keys? if so, on modules.nix you will see that the ips on that wireguard config correspond to wg-friend1...n when you get to this step pause and tell me to create the sops secrets for these public keys.
+
+5. I have two cicds on this server
+drwxrwxr-x. 11 deploy         www-data       4096 Dec 26 20:47 blog
+drwxr-xr-x.  2 lidarr-reports lidarr-reports 4096 Nov 11 17:52 lidarr-mb-gap
+drwxrwxr-x. 12 deploy         www-data       4096 Dec 26 21:01 portfolio 
+I need you to create the service users and groups for deploy and lidarr-reports.
+in those, I need you to add ./secrets/ssh/ed25519_deploy.pub to authorized_keys for the user deploy
+and for lidarr-reports ed25519_lidarr-reports.pub
+
+6. similar to every other host, add ssh login authorized_keys for workstation, server, deacero, galaxy and check if Im missing one. Because this will replace the ssh vps on the ssh config, you need to replace the existing vps ip with 45.33.0.228. 7. change the configuration on the host server, so that its wireguard session, connects to this server (i think will ve done automagically when the ip changes right?) 8. Ive added sudo_hist and jawz_hist, which are a dump of the histfile of this server, just check if there is a configuration that Im missing, something I did on there that I missed, and add it to the clarification list, so when I run clarify I tell you if I want that or not, granted lots of those commands are trial and error, so I think I have everything. 9. I have setup a plausible server, write the steps necesary to migrate it, I dont know.
+
+10. add verification steps for every task we did, when youre done and"
+
+## Clarifications
+
+### Session 2026-02-04
+
+- Q: Are any services being migrated to the new VPS, and what does enableProxy do? → A: No services are migrated; enableProxy only configures nginx on the VPS, wireguard exposes the port, and services continue running on the host server.
+- Q: How should the analytics service be migrated? → A: Migrate existing analytics data to the new server.
+- Q: How should firewall parity be achieved on the new VPS? → A: Use the existing iptables ruleset as the source of truth and implement equivalent nftables/NixOS firewall rules; document any intentional deviations.
+- Q: Where should VPN keys be stored? → A: Preserve keys only in the existing secrets system.
+- Q: Which admin hosts should receive SSH authorized_keys entries? → A: Only the listed hosts (workstation, server, deacero, galaxy).
+
+## User Scenarios & Testing *(mandatory)*
+
+### User Story 1 - Migrate VPS as Primary Host (Priority: P1)
+
+As an operator, I want the new VPS to become the primary host for reverse proxying and networking while services continue running on the host server, so public traffic and internal tunnels continue working after the migration.
+
+**Why this priority**: This is the core migration goal and failure would cause outages.
+
+**Independent Test**: Can be fully tested by switching the primary host role to the new VPS and verifying proxy and tunnel connectivity without depending on the other stories.
+
+**Acceptance Scenarios**:
+
+1. **Given** the new VPS is designated as the primary host, **When** proxying is enabled, **Then** public endpoints resolve through the new VPS while services remain on the host server.
+2. **Given** the previous VPS is no longer handling proxying, **When** traffic is routed through the new VPS, **Then** no service loses external access.
+
+---
+
+### User Story 2 - Preserve Firewall Behavior (Priority: P1)
+
+As an operator, I want the firewall behavior on the new VPS to match the existing VPS so that all current network paths continue to function.
+
+**Why this priority**: Firewall parity is critical to avoid breaking complex routing and hot-swap behavior.
+
+**Independent Test**: Can be fully tested by comparing allowed/blocked traffic and confirming all required network paths remain functional.
+
+**Acceptance Scenarios**:
+
+1. **Given** the firewall rules are applied to the new VPS, **When** all known inbound and outbound paths are exercised, **Then** they behave identically to the existing VPS.
+
+---
+
+### User Story 3 - Restore Secure Access and VPN Peers (Priority: P2)
+
+As an operator, I want VPN peers and SSH access to be configured on the new VPS so administration and CI/CD access remain available.
+
+**Why this priority**: Secure access is required for operating and deploying services.
+
+**Independent Test**: Can be fully tested by connecting each VPN peer and verifying SSH access for each authorized user.
+
+**Acceptance Scenarios**:
+
+1. **Given** the VPN configuration is enabled on the new VPS, **When** each peer connects, **Then** each peer receives the correct addresses and can reach intended resources.
+2. **Given** service users and admin users are created on the new VPS, **When** their authorized keys are used, **Then** SSH access succeeds with the expected permissions.
+
+---
+
+### User Story 4 - Capture Migration Gaps and Validation (Priority: P3)
+
+As an operator, I want a checklist of potential missing configuration from existing server history and clear verification steps so the migration is safe and complete.
+
+**Why this priority**: This reduces risk of overlooked manual changes and provides confidence during cutover.
+
+**Independent Test**: Can be fully tested by running the verification steps and confirming no missing items remain.
+
+**Acceptance Scenarios**:
+
+1. **Given** historical command logs are reviewed, **When** likely missing configurations are identified, **Then** they are listed as clarifications for user confirmation.
+2. **Given** verification steps are provided for each task, **When** the operator executes them, **Then** each migration task can be validated.
+
+---
+
+### Edge Cases
+
+- What happens when a subdomain mapping differs between the previous proxy configuration and the current service definitions?
+- How does the system handle a firewall rule that is ambiguous or conflicts with existing policy?
+- What happens if an SSH key file is missing or invalid for a service user?
+
+## Requirements *(mandatory)*
+
+### Functional Requirements
+
+- **FR-001**: The system MUST designate the new VPS as the primary host for reverse proxying and ensure all enabled services are routed through it without relocating the services.
+- **FR-002**: The system MUST ensure proxy configuration is enabled for all services currently enabled on the host server so traffic flows through the new VPS while services remain on the host server.
+- **FR-003**: The system MUST request existing proxy configuration files for verification and flag any subdomain mismatches against current service definitions.
+- **FR-004**: The system MUST mirror the existing iptables behavior on the new VPS using nftables/NixOS firewall rules and document any intentional deviations from the source ruleset.
+- **FR-005**: The system MUST enable the VPN configuration on the new VPS with the specified peer addresses and ensure each peer is uniquely identified.
+- **FR-006**: The system MUST support encrypting sensitive VPN keys and pause for user-provided secret material when required.
+- **FR-015**: The system MUST store VPN keys only in the existing secrets system and must not place them in plaintext configuration.
+- **FR-007**: The system MUST create service users and groups for deployment workflows and grant SSH access via specified public keys.
+- **FR-008**: The system MUST configure SSH access for all standard admin hosts and update the VPS connection target to the new public IP.
+- **FR-016**: The system MUST grant SSH access only to workstation, server, deacero, and galaxy admin hosts.
+- **FR-017**: The system MUST configure SSHD to use port 3456 and disable root/password authentication to match the existing VPS security posture.
+- **FR-018**: The system MUST harden remote rebuild access by using a non-root SSH user with least-privilege access for rebuild operations.
+- **FR-009**: The system MUST update dependent host configurations so existing VPN client connections target the new VPS.
+- **FR-010**: The system MUST review provided history logs and produce a clarification list of potential missing configurations.
+- **FR-011**: The system MUST document migration steps for the analytics service and include them in the migration plan.
+- **FR-013**: The system MUST include analytics data migration as part of the analytics service migration steps.
+- **FR-012**: The system MUST provide verification steps for each migration task performed.
+
+### Key Entities *(include if feature involves data)*
+
+- **Host**: A server instance that can be assigned primary or secondary roles and hosts services.
+- **Service**: A deployable workload with external endpoints and internal configuration.
+- **Proxy Mapping**: The set of subdomains and routing rules that map public traffic to services.
+- **Firewall Rule Set**: The collection of allowed and blocked network flows required for the VPS.
+- **VPN Peer**: A client identity with assigned addresses and access constraints.
+- **SSH Key**: A public key used for authenticated access to a user account.
+- **Migration Checklist**: A list of tasks and verification steps that confirm readiness.
+
+## Success Criteria *(mandatory)*
+
+### Measurable Outcomes
+
+- **SC-001**: 100% of services previously reachable via the old VPS are reachable via the new VPS after cutover.
+- **SC-002**: All documented firewall flows (inbound and outbound) pass or block with the same outcomes as the old VPS.
+- **SC-003**: 100% of configured VPN peers can connect and reach required internal addresses.
+- **SC-004**: 100% of authorized SSH users can authenticate using their specified keys.
+- **SC-005**: Migration verification steps can be completed in a single run without unresolved failures.
+
+## Assumptions
+
+- The existing proxy configuration files will be provided by the user for comparison.
+- The firewall rules from the existing VPS are authoritative and should be mirrored on the new VPS, even if implemented via nftables equivalents.
+- The list of standard admin hosts for SSH access is complete unless the review identifies an omission.
+- The analytics service migration steps are documentation-only and do not require immediate cutover.
diff --git a/specs/004-vps-migration/tasks.md b/specs/004-vps-migration/tasks.md
new file mode 100644
index 0000000..3f4155a
--- /dev/null
+++ b/specs/004-vps-migration/tasks.md
@@ -0,0 +1,93 @@
+# Tasks: VPS Migration
+
+**Branch**: `004-vps-migration`  
+**Date**: 2026-02-04  
+**Spec**: /home/jawz/Development/NixOS/specs/004-vps-migration/spec.md  
+**Plan**: /home/jawz/Development/NixOS/specs/004-vps-migration/plan.md
+
+## Implementation Strategy
+
+Deliver MVP as User Story 1 (primary host reverse proxy + keep services on host server). Then complete firewall parity (US2), secure access (US3), and migration gap review + verification (US4).
+
+## Phase 1: Setup
+
+- [x] T001 Confirm baseline files exist: iptables (reference ruleset), secrets/ssh/ed25519_deploy.pub, secrets/ssh/ed25519_lidarr-reports.pub, secrets system entries for VPN keys
+- [x] T002 Create working checklist placeholder for verification steps in /home/jawz/Development/NixOS/specs/004-vps-migration/tasks.md (this file)
+
+## Phase 2: Foundational
+
+- [x] T003 [P] Review mainServer and enableProxy options in hosts/server/toggles.nix and modules/modules.nix
+- [x] T004 [P] Review wireguard module in modules/services/wireguard.nix and VPS host config in hosts/vps/configuration.nix
+- [x] T005 [P] Review SSH host/IP settings in config/jawz.nix and modules/modules.nix for vps IP updates
+- [x] T006 [P] Review caddy file list references in ./jawz_hist and ./sudo_hist to prepare subdomain comparison inputs
+
+## Phase 3: User Story 1 (P1) - Primary VPS reverse proxy
+
+**Story goal**: New VPS is primary reverse-proxy host (nginx only) while services remain on host server.
+
+**Independent test criteria**: Proxy mappings resolve through VPS to host server services without relocating services.
+
+- [x] T007 [US1] Set mainServer to \"vps\" in hosts/server/toggles.nix
+- [x] T008 [US1] Enable proxying on VPS by setting my.enableProxy = true in hosts/vps/configuration.nix and ensure services in hosts/server/toggles.nix have enableProxy = true
+- [x] T009 [US1] Capture provided caddy config files (e.g., /etc/caddy/Caddyfile.d/*) and compare subdomains to modules/servers/*.nix domain definitions; document mismatches in specs/004-vps-migration/quickstart.md
+- [x] T010 [US1] Add shared client certificate handling from modules/servers/synapse.nix into the factory or shared module and apply it to mTLS-protected sites (use secrets/certs.yaml for client CA)
+
+## Phase 4: User Story 2 (P1) - Firewall parity
+
+**Story goal**: Firewall behavior on new VPS matches old VPS by implementing nftables/NixOS rules derived from the iptables reference.
+
+**Independent test criteria**: Known inbound/outbound flows match existing VPS behavior.
+
+- [x] T011 [US2] Apply firewall parity to VPS configuration using nftables/NixOS rules derived from the repo root iptables reference and document any intentional deviations
+
+## Phase 5: User Story 3 (P2) - Secure access and VPN peers
+
+**Story goal**: Wireguard enabled on VPS with secrets-managed keys; SSH access for service users and admin hosts.
+
+**Independent test criteria**: VPN peers connect with correct addresses; SSH keys authenticate as expected.
+
+- [x] T012 [US3] Enable wireguard module on VPS in hosts/vps/configuration.nix (my.services.wireguard.enable = true) and ensure listen port exposed
+- [x] T013 [US3] Add sops secrets entries for wireguard keys in secrets/wireguard.yaml and confirm user-provided key material
+- [x] T014 [US3] Update wireguard peer configuration in modules/services/wireguard.nix using sops secrets refs for public/private keys (no plaintext)
+- [x] T015 [US3] Add service users and groups deploy and lidarr-reports with authorized_keys in hosts/vps/configuration.nix using secrets/ssh/ed25519_deploy.pub and secrets/ssh/ed25519_lidarr-reports.pub
+- [x] T016 [US3] Add admin SSH authorized_keys for workstation, server, deacero, galaxy in hosts/vps/configuration.nix
+- [x] T017 [US3] Configure sshd port and auth settings in hosts/vps/configuration.nix to match: Port 3456, PermitRootLogin no, PasswordAuthentication no
+- [x] T018 [US3] Harden remote rebuild access by switching to a non-root SSH user for rebuilds (nixremote) and requiring sudo for nixos-rebuild in hosts/vps/configuration.nix and modules/users/nixremote.nix
+- [x] T019 [US3] Restrict SSH access for remote rebuilds by limiting allowed users/keys for nixremote (update inputs.self.lib.getSshKeys list in hosts/vps/configuration.nix)
+- [x] T020 [US3] Update VPS IP to 45.33.0.228 in modules/modules.nix and config/jawz.nix SSH host entry
+- [x] T021 [US3] Update host server wireguard client configuration in hosts/server/configuration.nix to target the new VPS endpoint
+
+## Phase 6: User Story 4 (P3) - Migration gaps and verification
+
+**Story goal**: Identify missing configuration from history logs and provide verification steps for every task.
+
+**Independent test criteria**: Clarification list exists and each task has a verification step.
+
+- [x] T022 [US4] Review sudo_hist and jawz_hist for missing configuration; record clarification list in specs/004-vps-migration/quickstart.md
+- [x] T023 [US4] Document analytics data migration steps (export, import, validate) in specs/004-vps-migration/quickstart.md
+- [x] T024 [US4] Add verification steps for each task in specs/004-vps-migration/quickstart.md
+
+## Phase 7: Polish & Cross-Cutting Concerns
+
+- [x] T025 [P] Update references to old VPS proxy logic (caddy) to ensure nginx is the only runtime proxy in README.org and docs/*.md
+- [x] T026 [P] Validate all task descriptions include explicit file paths in specs/004-vps-migration/tasks.md and update mismatches
+- [x] T027 [P] Move static site vhosts (portfolio/blog and mb-report) into modules/websites and enable them via host toggles
+
+## Dependencies
+
+- US1 → US2 → US3 → US4
+
+## Parallel Execution Examples
+
+- US1: T007, T008, T009 can proceed once T003 and T006 are reviewed.
+- US2: T011 can proceed once the iptables reference ruleset location is identified.
+- US3: T012, T016, T017, T018, and T020 can proceed after T004 and T005 review; T013 depends on user-provided secrets.
+- US4: T022, T023, T024 can proceed independently once logs are reviewed and quickstart.md is open.
+
+## Validation
+
+- All tasks use the required checklist format with IDs, story labels, and explicit file paths.
+
+## Verification Steps (Placeholder)
+
+- To be filled during T024 with per-task verification steps.