add rtc foci

clients/quadraticserver/matrix/call.nix

@@ -4,19 +4,26 @@
   config,
   ...
 }:
-{
-  systemd.services = {
-    livekit.serviceConfig.Restart = lib.mkForce "always";
-    lk-jwt-service.serviceConfig.Restart = lib.mkForce "always";
-  };
 
-  services =
 let
   domain = "call.federated.nexus";
   livekitDomain = "livekit.call.federated.nexus";
   lkJwtServiceDomain = "lk-jwt.call.federated.nexus";
 in
 {
+  systemd.services = {
+    livekit.serviceConfig.Restart = lib.mkForce "always";
+    lk-jwt-service.serviceConfig.Restart = lib.mkForce "always";
+  };
+
+  quad.matrix.settings.matrix_rtc.foci = [
+    {
+      type = "livekit";
+      livekit_service_url = lkJwtServiceDomain;
+    }
+  ];
+
+  services = {
     livekit = {
       enable = true;
       openFirewall = true;

clients/quadraticserver/matrix/cinny.nix

@@ -38,8 +38,8 @@
         src = pkgs.fetchFromCodeberg {
           owner = "lapingvino";
           repo = "cinny";
-          rev = "8228227f64cf22c8cda2bc7cea1d5948d007822b";
+          rev = "2ccfeeabfa0f1ac22ba216d3e8a993199e46e8f5";
-          hash = "sha256-JcZ2jhKrxwtzbnhvCAS4yVF788TmocYoIOFJsV0QdbU=";
+          hash = "sha256-AeJnT4itxpoIu2MqEapi7zv5TomDuUuj0wVs9oMTxCs=";
         };
         npmDeps = pkgs.fetchNpmDeps {
           inherit src;

modules/server/continuwuity.nix

@@ -34,7 +34,7 @@
           enable = config.quad.matrix.enable;
           package = inputs.continuwuity.packages.${pkgs.stdenv.hostPlatform.system}.default;
           group = "caddy";
-          settings.global = config.quad.matrix.settings // {
+          settings.global = lib.recursiveUpdate {
             server_name = config.quad.matrix.domain;
             unix_socket_path = socket;
 
@@ -68,7 +68,7 @@
               client = "https://${subdomain}";
               server = "${subdomain}:443";
             };
-          };
+          } config.quad.matrix.settings;
         };
 
         caddy.virtualHosts."${subdomain}".extraConfig = "reverse_proxy unix/${socket}";