From 7d0b335626badd9d3c05dfbc13b847bff55d9ae0 Mon Sep 17 00:00:00 2001 From: yukkop Date: Sun, 31 May 2026 11:09:52 +0000 Subject: [PATCH] fix?: `matrix-cluster-users` --- nixos/module/hectic/service/element-rtc.nix | 11 +++++++---- nixos/module/hectic/service/element.nix | 13 ++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/module/hectic/service/element-rtc.nix b/nixos/module/hectic/service/element-rtc.nix index df9dc9a3..b3c6fb33 100644 --- a/nixos/module/hectic/service/element-rtc.nix +++ b/nixos/module/hectic/service/element-rtc.nix @@ -10,12 +10,15 @@ ... }: let legacyCfg = config.hectic.services.matrix; - clusterCfg = config.hectic.generic.matrix-cluster; + hasClusterCfg = config.hectic ? generic && config.hectic.generic ? matrix-cluster; + clusterCfg = if hasClusterCfg then config.hectic.generic.matrix-cluster else null; clusterSynapseEnabled = - clusterCfg.enable - && (if clusterCfg.overrideEnableSynapse != null then clusterCfg.overrideEnableSynapse else clusterCfg.role == "primary"); + if hasClusterCfg + then clusterCfg.enable + && (if clusterCfg.overrideEnableSynapse != null then clusterCfg.overrideEnableSynapse else clusterCfg.role == "primary") + else false; enabled = legacyCfg.enable || clusterSynapseEnabled; - matrixDomain = if legacyCfg.enable then legacyCfg.matrixDomain else clusterCfg.matrixDomain; + matrixDomain = if legacyCfg.enable then legacyCfg.matrixDomain else if hasClusterCfg then clusterCfg.matrixDomain else ""; in { config = lib.mkIf enabled (let keyFile = "/run/livekit.key"; diff --git a/nixos/module/hectic/service/element.nix b/nixos/module/hectic/service/element.nix index fe8e9a6e..96b97bf0 100644 --- a/nixos/module/hectic/service/element.nix +++ b/nixos/module/hectic/service/element.nix @@ -10,16 +10,19 @@ ... }: let legacyCfg = config.hectic.services.matrix; - clusterCfg = config.hectic.generic.matrix-cluster; + hasClusterCfg = config.hectic ? generic && config.hectic.generic ? matrix-cluster; + clusterCfg = if hasClusterCfg then config.hectic.generic.matrix-cluster else null; clusterSynapseEnabled = - clusterCfg.enable - && (if clusterCfg.overrideEnableSynapse != null then clusterCfg.overrideEnableSynapse else clusterCfg.role == "primary"); + if hasClusterCfg + then clusterCfg.enable + && (if clusterCfg.overrideEnableSynapse != null then clusterCfg.overrideEnableSynapse else clusterCfg.role == "primary") + else false; enabled = legacyCfg.enable || clusterSynapseEnabled; - matrixDomain = if legacyCfg.enable then legacyCfg.matrixDomain else clusterCfg.matrixDomain; + matrixDomain = if legacyCfg.enable then legacyCfg.matrixDomain else if hasClusterCfg then clusterCfg.matrixDomain else ""; jitsiPreferredDomain = if legacyCfg.enable && config.hectic.services.jitsi.enable then config.hectic.services.jitsi.hostName - else clusterCfg.jitsi.preferredDomain; + else if hasClusterCfg then clusterCfg.jitsi.preferredDomain else null; in { config = lib.mkIf enabled { services.nginx.virtualHosts."element.${matrixDomain}" = {