feat: override continuwuity package
This commit is contained in:
parent
84bb31214c
commit
1a3d1f1fdd
4 changed files with 39 additions and 2 deletions
|
|
@ -58,7 +58,7 @@ in
|
||||||
"org.matrix.msc4143.rtc_foci": [
|
"org.matrix.msc4143.rtc_foci": [
|
||||||
{
|
{
|
||||||
"type": "livekit",
|
"type": "livekit",
|
||||||
"livekit_service_url": "https://livekit.${net.devices.remote_proxy.domain}/livekit/jwt"
|
"livekit_service_url": "https://livekit.${net.devices.remote_proxy.domain}"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,12 @@ rec {
|
||||||
trusted_servers = [ "matrix.org" ];
|
trusted_servers = [ "matrix.org" ];
|
||||||
memory_max = "512M";
|
memory_max = "512M";
|
||||||
livekit_url = "https://livekit.nudelerde.de/livekit/jwt";
|
livekit_url = "https://livekit.nudelerde.de/livekit/jwt";
|
||||||
|
|
||||||
|
package = {
|
||||||
|
version = "0.5.6";
|
||||||
|
sourceHash = "sha256-p6dL1wL9n+1ivUItdlZuLxTneDBjCHEdNr0ukau2rHI=";
|
||||||
|
cargoHash = "sha256-lLbnFA2WS96er84G2e9bGrYhhqe2zL3Npn1SXB3De2w=";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
qbittorrent = {
|
qbittorrent = {
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
timeZone = "Europe/Berlin";
|
timeZone = "Europe/Berlin";
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
|
storageConfig = import ./config/storage.nix;
|
||||||
storageModel = import ./intermediate/storage.nix;
|
storageModel = import ./intermediate/storage.nix;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -21,6 +22,13 @@ in {
|
||||||
|
|
||||||
fileSystems = storageModel.fileSystems;
|
fileSystems = storageModel.fileSystems;
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "${storageConfig.ssd.path}/swapfile";
|
||||||
|
size = 8192;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
networking.hostName = "raspberry";
|
networking.hostName = "raspberry";
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,38 @@
|
||||||
let
|
let
|
||||||
serv = import ../config/services.nix;
|
serv = import ../config/services.nix;
|
||||||
serviceValidation = import ../validation/service/continuwuity.nix;
|
serviceValidation = import ../validation/service/continuwuity.nix;
|
||||||
|
continuwuity = serv.continuwuity;
|
||||||
|
|
||||||
serverName = serviceValidation.getServerName serv;
|
serverName = serviceValidation.getServerName serv;
|
||||||
|
|
||||||
trustedServers = serviceValidation.getTrustedServers serv;
|
trustedServers = serviceValidation.getTrustedServers serv;
|
||||||
memoryMax = serviceValidation.getMemoryMax serv;
|
memoryMax = serviceValidation.getMemoryMax serv;
|
||||||
|
|
||||||
|
package = if continuwuity ? package then
|
||||||
|
pkgs.matrix-continuwuity.overrideAttrs (old: rec {
|
||||||
|
version = continuwuity.package.version;
|
||||||
|
pname = old.pname or "matrix-continuwuity";
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitea {
|
||||||
|
domain = "forgejo.ellis.link";
|
||||||
|
owner = "continuwuation";
|
||||||
|
repo = "continuwuity";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = continuwuity.package.sourceHash;
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
|
||||||
|
inherit src;
|
||||||
|
hash = continuwuity.package.cargoHash;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
else
|
||||||
|
pkgs.matrix-continuwuity;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.matrix-continuwuity = {
|
services.matrix-continuwuity = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = package;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
server_name = serverName;
|
server_name = serverName;
|
||||||
|
|
@ -22,7 +45,7 @@ in
|
||||||
trusted_servers = trustedServers;
|
trusted_servers = trustedServers;
|
||||||
matrix_rtc = {
|
matrix_rtc = {
|
||||||
foci = [
|
foci = [
|
||||||
{ type = "livekit"; livekit_service_url = serv.continuwuity.livekit_url; }
|
{ type = "livekit"; livekit_service_url = continuwuity.livekit_url; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue