got a bunch of shit fixed
This commit is contained in:
@@ -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";
|
||||
# # };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user