Henry-Hiles/nixos
Watch
1
1
Fork
You've already forked nixos
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use nixpkgs#548367

Browse source
This commit is contained in:
Henry Hiles 2026-10-17 20:56:05 -04:00
commit b0d928d0f2
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
clients/quadraticserver/matrix/call.nix
View file

@ -1,6 +1,7 @@
{
lib,
config,
inputs,
...
}:
@ -9,6 +10,10 @@ let
lkJwtServiceDomain = "lk-jwt.call.federated.nexus";
in
{
# TODO: remove once https://github.com/NixOS/nixpkgs/pull/548367 is merged
disabledModules = [ "services/matrix/lk-jwt-service.nix" ];
imports = [ inputs.lk-jwt-service-module.outPath ];
systemd.services = {
livekit.serviceConfig.Restart = lib.mkForce "always";
lk-jwt-service.serviceConfig.Restart = lib.mkForce "always";
@ -31,13 +36,18 @@ in
lk-jwt-service = {
enable = true;
livekitUrl = "wss://${livekitDomain}";
keyFile = config.services.livekit.keyFile;
environment = {
LIVEKIT_URL = "wss://${livekitDomain}";
LIVEKIT_KEY_FILE = config.services.livekit.keyFile;
LIVEKIT_JWT_BIND = "127.0.0.4:8080";
LIVEKIT_FULL_ACCESS_HOMESERVERS = [ "federated.nexus" ];
};
};
caddy.virtualHosts = {
"${livekitDomain}".extraConfig = "reverse_proxy 127.0.0.1:7880";
"${lkJwtServiceDomain}".extraConfig = "reverse_proxy 127.0.0.1:8080";
"${lkJwtServiceDomain}".extraConfig =
"reverse_proxy ${config.services.lk-jwt-service.environment.LIVEKIT_JWT_BIND}";
};
};
}

13
flake.lock generated
View file

@ -738,6 +738,18 @@
"url": "https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy"
}
},
"lk-jwt-service-module": {
"flake": false,
"locked": {
"narHash": "sha256-UkmiOkQFrQTzbPK3mjyobI9WnYB2zruLiMOgLYY/V40=",
"type": "file",
"url": "https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix"
}
},
"matrixoidc": {
"inputs": {
"flake-parts": "flake-parts_7",
@ -1079,6 +1091,7 @@
"flake-parts": "flake-parts_5",
"home-manager": "home-manager",
"lasuite-docs-proxy": "lasuite-docs-proxy",
"lk-jwt-service-module": "lk-jwt-service-module",
"matrixoidc": "matrixoidc",
"nexus": "nexus",
"nexusbot": "nexusbot",

5
flake.nix
View file

@ -79,6 +79,11 @@
url = "github:Silvenga/redlib";
flake = false;
};
# TODO: remove once https://github.com/NixOS/nixpkgs/pull/548367 is merged
lk-jwt-service-module = {
url = "file+https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix";
flake = false;
};
};
outputs =