Refactor configs

linux/singularity/caddy.nix

@@ -2,20 +2,20 @@
   config,
   pkgs,
   ...
-}: {
+}:
+with config.constants; {
   services.caddy = {
     enable = true;
-    email = config.constants.postMaster;
+    email = postMaster;
     virtualHosts = let
-      dn = config.constants.domain;
       homeSrv = s: "nebula:${portStr.${s}}";
-      localSrv = s: "${config.constants.localhost}:${portStr.${s}}";
+      localSrv = s: "${localhost}:${portStr.${s}}";
       msfqdn = config.mailserver.fqdn;
-      mtfqdn = "matrix.${dn}";
-      portStr = builtins.mapAttrs (n: v: toString v) config.constants.port;
+      mtfqdn = "matrix.${domain}";
+      portStr = builtins.mapAttrs (n: v: toString v) port;
       wn = s: "/.well-known/${s}";
     in {
-      "${dn}".extraConfig = let
+      "${domain}".extraConfig = let
         wnm = wn "matrix";
       in ''
         header ${wnm}/* Content-Type application/json
@@ -26,22 +26,22 @@
           "m.identity_server": { "base_url": "https://${mtfqdn}" }
         }`
       '';
-      "aria2.${dn}".extraConfig = ''
+      "aria2.${domain}".extraConfig = ''
         reverse_proxy /jsonrpc ${homeSrv "aria2"}
         file_server {
           root ${pkgs.ariang}/share/ariang
         }
       '';
-      "forgejo.${dn}".extraConfig = ''
+      "forgejo.${domain}".extraConfig = ''
         reverse_proxy ${homeSrv "forgejo"}
       '';
-      "headscale.${dn}".extraConfig = ''
+      "headscale.${domain}".extraConfig = ''
         reverse_proxy ${localSrv "headscale"}
       '';
-      "jellyfin.${dn}".extraConfig = ''
+      "jellyfin.${domain}".extraConfig = ''
         reverse_proxy ${homeSrv "jellyfin"}
       '';
-      "jellyseerr.${dn}".extraConfig = ''
+      "jellyseerr.${domain}".extraConfig = ''
         reverse_proxy ${homeSrv "jellyseerr"}
       '';
       ${msfqdn} = {
@@ -52,24 +52,18 @@
         '';
         useACMEHost = msfqdn;
       };
-      "matrix.${dn}".extraConfig = ''
+      "matrix.${domain}".extraConfig = ''
         reverse_proxy /_matrix/* ${homeSrv "conduit"}
         file_server {
-          root ${pkgs.cinny.override {
-          conf = {
-            defaultHomeserver = 0;
-            hashRouter.enabled = true;
-            homeserverList = [dn];
-          };
-        }}
+          root ${pkgs.fluffychat-web}
         }
       '';
-      "vault.${dn}".extraConfig = ''
+      "vault.${domain}".extraConfig = ''
         reverse_proxy ${localSrv "vault"} {
           header_up X-Real-IP {remote_host}
         }
       '';
-      "writefreely.${dn}".extraConfig = ''
+      "writefreely.${domain}".extraConfig = ''
         reverse_proxy ${homeSrv "writefreely"}
       '';
     };
@@ -78,7 +72,7 @@
   security.acme = {
     acceptTerms = true;
     defaults = {
-      email = config.constants.postMaster;
+      email = postMaster;
       webroot = "/var/lib/acme/acme-challenge";
     };
   };