Merge branch 'main' of ssh://grimmauld.de:2222/Grimmauld/grimm-nixos-laptop

This commit is contained in:
Grimmauld 2025-01-15 14:01:33 +01:00
commit 19bedee269
4 changed files with 15 additions and 7 deletions

View file

@ -18,7 +18,7 @@ in
# ./discord-matrix-bridge.nix # ./discord-matrix-bridge.nix
./mastodon.nix ./mastodon.nix
./nix_cache.nix ./nix_cache.nix
./ooye.nix ./ooye
# ./auth.nix # ./auth.nix
./hedgedoc.nix ./hedgedoc.nix
# ./factorio.nix # ./factorio.nix
@ -151,6 +151,11 @@ in
host = "puffer.${domain}"; host = "puffer.${domain}";
accessType = "proxy"; accessType = "proxy";
}; };
ooye = {
port = 6693;
host = "ooye.${domain}";
accessType = "proxy";
};
hedgedoc_host = { hedgedoc_host = {
port = 8048; port = 8048;
host = "hedgedoc.${domain}"; host = "hedgedoc.${domain}";

View file

@ -28,7 +28,7 @@ in
workers.federationReceivers = 1; workers.federationReceivers = 1;
workers.initialSyncers = 1; workers.initialSyncers = 1;
workers.normalSyncers = 1; workers.normalSyncers = 1;
workers.eventPersisters = 2; workers.eventPersisters = 1;
workers.useUserDirectoryWorker = true; workers.useUserDirectoryWorker = true;
mainLogConfig = ./matrix_synapse_log_config.yaml; mainLogConfig = ./matrix_synapse_log_config.yaml;
@ -38,7 +38,7 @@ in
settings = { settings = {
suppress_key_server_warning = true; suppress_key_server_warning = true;
server_name = domain; server_name = domain;
public_baseurl = "https://${domain}"; public_baseurl = "https://${vhosts.matrix_host.host}";
enable_registration = true; enable_registration = true;
registration_requires_token = true; registration_requires_token = true;
registration_shared_secret_path = config.age.secrets.synapse_registration_shared_secret.path; registration_shared_secret_path = config.age.secrets.synapse_registration_shared_secret.path;

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ ooye ];
}

7
modules/ooye/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ ooye ];
services.matrix-synapse-next.settings.app_service_config_files = [ ./registration.yaml ];
}