Commit 85cb49b

@@ -14,10 +14,16 @@
       ];
     };
 
-    nixos = {
+    nixos = {pkgs, ...}: {
       services.caddy = {
         enable = true;
         enableReload = true;
+        package = pkgs.caddy.withPlugins {
+          plugins = [
+            "github.com/caddy-dns/cloudflare@v0.2.4"
+          ];
+          hash = "sha256-7GoH8YLCoPmPExQxoga2FHB58zQDoZVf1BBwkVi0SsQ=";
+        };
 
         globalConfig = ''
           http_port   80
@@ -32,8 +38,8 @@
   den.aspects.services.caddy.reverse-proxy-collector = {host, ...}: {
     nixos = {
       reverseProxy,
-      config,
       lib,
+      config,
       ...
     }: let
       inherit

@@ -76,15 +76,7 @@
           ]);
     in
       lib.mkIf enabled {
-        services.caddy = {
-          package = pkgs.caddy.withPlugins {
-            plugins = [
-              "github.com/caddy-dns/cloudflare@v0.2.4"
-            ];
-            hash = "sha256-7GoH8YLCoPmPExQxoga2FHB58zQDoZVf1BBwkVi0SsQ=";
-          };
-          virtualHosts = virtualHosts;
-        };
+        services.caddy.virtualHosts = virtualHosts;
 
         systemd.services.caddy.serviceConfig.EnvironmentFile = [config.vaultix.templates.caddy-tailnet-env.path];