diff --git a/flake.lock b/flake.lock index 4e6b63f..a4a6020 100644 --- a/flake.lock +++ b/flake.lock @@ -27,15 +27,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777481115, - "narHash": "sha256-9YKAG9ErJz4/HpiMpmixKJo+IKkRnXhoaSfkoOyj2o0=", + "lastModified": 1777364820, + "narHash": "sha256-XHxV1V62RJlU/Y49WD6fNIyESJCHKMVwuoN+WIa3gLg=", "ref": "refs/heads/main", - "rev": "e6cae5b8eda99337ca78b1500e913932f966c9f4", - "revCount": 6730, + "rev": "1cc9dbf2a47b7b329507cc4ddc970e10b968121c", + "revCount": 6618, "type": "git", "url": "https://forgejo.ellis.link/continuwuation/continuwuity" }, "original": { + "rev": "1cc9dbf2a47b7b329507cc4ddc970e10b968121c", "type": "git", "url": "https://forgejo.ellis.link/continuwuation/continuwuity" } diff --git a/flake.nix b/flake.nix index a5605fe..bae9a27 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,11 @@ }; continuwuity = { - url = "git+https://forgejo.ellis.link/continuwuation/continuwuity"; + # Pinned: revs after 1cc9dbf2 (revCount > 6618) bumped ruma to a version + # where RtcFocusInfo / RtcTransport use a hand-rolled + # Box::::deserialize impl that toml-rs can't satisfy, + # breaking any non-empty matrix_rtc.foci config. + url = "git+https://forgejo.ellis.link/continuwuation/continuwuity?rev=1cc9dbf2a47b7b329507cc4ddc970e10b968121c"; }; dicebot = { diff --git a/services/matrix.nix b/services/matrix.nix index 45de740..dc139f7 100644 --- a/services/matrix.nix +++ b/services/matrix.nix @@ -28,17 +28,16 @@ turn_secret_file = config.sops.secrets."coturn/auth_secret_home".path; turn_ttl = 86400; - matrix_rtc.foci = []; + matrix_rtc.foci = [ + { + type = "livekit"; + livekit_service_url = "https://lk-jwt.ellie.town"; + } + ]; well_known = { client = "https://matrix.ellie.town"; server = "matrix.ellie.town:443"; - rtc_focus_server_urls = [ - { - type = "livekit"; - livekit_service_url = "https://lk-jwt.ellie.town"; - } - ]; }; }; };