From 6748c8aca912c876ce257052ef7f70de48382654 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 20 Jun 2025 22:37:18 -0400 Subject: [PATCH] working OOYE --- clients/quadraticserver/bridges.nix | 20 ++++++++++---------- modules/desktop/desktop.nix | 6 +++--- modules/desktop/obs.nix | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/clients/quadraticserver/bridges.nix b/clients/quadraticserver/bridges.nix index bcac322..8777f14 100644 --- a/clients/quadraticserver/bridges.nix +++ b/clients/quadraticserver/bridges.nix @@ -49,16 +49,16 @@ in { }; }; - # matrix-ooye = { - # enable = true; - # homeserver = config.services.grapevine.settings.server_discovery.client.base_url; - # homeserverName = "federated.nexus"; - # discordTokenPath = config.age.secrets."discordToken.age".path; - # discordClientSecretPath = config.age.secrets."discordClientSecret.age".path; + matrix-ooye = { + enable = true; + homeserver = config.services.grapevine.settings.server_discovery.client.base_url; + homeserverName = "federated.nexus"; + discordTokenPath = config.age.secrets."discordToken.age".path; + discordClientSecretPath = config.age.secrets."discordClientSecret.age".path; + socket = "8081"; + bridgeOrigin = "https://${domain}"; + }; - # bridgeOrigin = "https://${domain}"; - # }; - - # caddy.virtualHosts."${domain}".extraConfig = "reverse_proxy unix/${matrix-ooye.socket}"; + caddy.virtualHosts."${domain}".extraConfig = "reverse_proxy 127.0.0.1:8081"; }; } diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index d13b930..583d198 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -1,8 +1,8 @@ { environment.sessionVariables.NIXOS_OZONE_WL = "1"; - services.displayManager = { - gdm.enable = true; - gnome.enable = true; + services = { + desktopManager.gnome.enable = true; + displayManager.gdm.enable = true; }; } diff --git a/modules/desktop/obs.nix b/modules/desktop/obs.nix index 708e2da..77d52dc 100644 --- a/modules/desktop/obs.nix +++ b/modules/desktop/obs.nix @@ -2,5 +2,6 @@ programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [obs-pipewire-audio-capture]; + enableVirtualCamera = true; }; }