got a bunch of shit fixed

This commit is contained in:
Anish Lakhwara
2025-09-12 00:29:37 -07:00
parent 4049df5724
commit 01c65f54af
21 changed files with 383 additions and 201 deletions
+2 -2
View File
@@ -47,9 +47,9 @@
# The registration file is automatically generated after starting the appservice for the first time.
# cp /var/lib/matrix-appservice-discord/discord-registration.yaml /var/lib/matrix-synapse/
# chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/discord-registration.yaml
"/var/lib/matrix-synapse/telegram-registration.yaml"
# "/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/matrix-synapse/signal-registration.yaml"
"/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
#"/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
"/var/lib/matrix-as-discord/discord-registration.yaml"
# "/var/lib/matrix-synapse/slack-registration.yaml"
# "/var/lib/matrix-synapse/discord-registration.yaml"
+32 -32
View File
@@ -2,17 +2,17 @@
{
# Mautrix-signal settings
services.signald.enable = true;
systemd.services.matrix-as-signal = {
requires = [ "signald.service" ];
after = [ "signald.service" ];
unitConfig = {
JoinsNamespaceOf = "signald.service";
};
path = [
pkgs.ffmpeg # voice messages need `ffmpeg`
];
};
# services.signald.enable = true;
# systemd.services.matrix-as-signal = {
# requires = [ "signald.service" ];
# after = [ "signald.service" ];
# unitConfig = {
# JoinsNamespaceOf = "signald.service";
# };
# path = [
# pkgs.ffmpeg # voice messages need `ffmpeg`
# ];
# };
services.matrix-appservices = {
addRegistrationFiles = false;
@@ -25,28 +25,28 @@
# package = pkgs.mautrix-whatsapp;
# };
# discord = {
# port = 29188;
# format = "mautrix-go";
# package = pkgs.unstable.mautrix-discord;
# };
signal = {
port = 29184;
format = "mautrix-python";
package = pkgs.mautrix-signal;
serviceConfig = {
StateDirectory = [ "matrix-as-signal" "signald" ];
SupplementaryGroups = [ "signald" ];
TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
User = lib.mkForce config.services.signald.user;
Group = lib.mkForce config.services.signald.group;
};
settings.signal = {
socket_path = config.services.signald.socketPath;
outgoing_attachment_dir = "/var/lib/signald/tmp";
};
discord = {
port = 29188;
format = "mautrix-go";
package = pkgs.mautrix-discord;
};
# signal = {
# port = 29184;
# format = "mautrix-python";
# package = pkgs.mautrix-signal;
# serviceConfig = {
# # StateDirectory = [ "matrix-as-signal" "signald" ];
# # SupplementaryGroups = [ "signald" ];
# TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
# # User = lib.mkForce config.services.signald.user;
# # Group = lib.mkForce config.services.signald.group;
# };
# # settings.signal = {
# # socket_path = config.services.signald.socketPath;
# # outgoing_attachment_dir = "/var/lib/signald/tmp";
# # };
# };
};
};
}