balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix matrix

Browse Source
This commit is contained in:
Alexander Bantyev 2020-08-04 14:51:37 +03:00
parent 02532d7211
commit d4369f1013
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/default.nix
View File

@ -9,6 +9,7 @@ device:
./applications/okular.nix ./applications/okular.nix
./applications/yt-utilities.nix ./applications/yt-utilities.nix
./applications/firefox.nix ./applications/firefox.nix
./applications/spectral.nix
./workspace/sway ./workspace/sway
./workspace/i3blocks ./workspace/i3blocks
./workspace/zsh.nix ./workspace/zsh.nix

54
modules/matrix-synapse.nix
View File

@ -49,33 +49,41 @@
mkdir -p /var/lib/mautrix-whatsapp mkdir -p /var/lib/mautrix-whatsapp
cd /var/lib/mautrix-whatsapp cd /var/lib/mautrix-whatsapp
sleep 5 sleep 5
timeout 900 mautrix-whatsapp -c ${ mautrix-whatsapp -c ${
builtins.toFile "config_wa.yaml" builtins.toFile "config_wa.yaml"
(builtins.toJSON config.secrets.matrix.mautrix-whatsapp.config) (builtins.toJSON config.secrets.matrix.mautrix-whatsapp.config)
} }
''; '';
}; };
systemd.services.mautrix-telegram = { # systemd.services.mautrix-telegram = {
description = "A bridge between telegram and matrix"; # description = "A bridge between telegram and matrix";
requires = [ "matrix-synapse.service" ]; # requires = [ "matrix-synapse.service" ];
path = with pkgs; [ coreutils mautrix-telegram ]; # path = with pkgs; [ coreutils mautrix-telegram ];
serviceConfig = { # serviceConfig = {
Restart = "always"; # Restart = "always";
RestartSec = 1; # RestartSec = 1;
}; # };
wantedBy = [ "network-online.target" ]; # wantedBy = [ "network-online.target" ];
script = '' # script = ''
mkdir -p /var/lib/mautrix-telegram # mkdir -p /var/lib/mautrix-telegram
cp -r ${pkgs.mautrix-telegram}/* /var/lib/mautrix-telegram # cp -r ${pkgs.mautrix-telegram}/* /var/lib/mautrix-telegram
cd /var/lib/mautrix-telegram # cd /var/lib/mautrix-telegram
alembic upgrade head || echo "update failed" # alembic upgrade head || echo "update failed"
sleep 5 # sleep 5
cp ${ # cp ${
builtins.toFile "config.yaml" # builtins.toFile "config.yaml"
(builtins.toJSON config.secrets.matrix.mautrix-telegram.config) # (builtins.toJSON config.secrets.matrix.mautrix-telegram.config)
} ./config.yaml # } ./config.yaml
timeout 900 mautrix-telegram # timeout 900 mautrix-telegram
''; # '';
# };
services.mautrix-telegram = {
enable = true;
settings = config.secrets.matrix.mautrix-telegram.config;
}; };
systemd.services.mautrix-telegram.serviceConfig.DynamicUser = lib.mkForce false;
users.users.matrix-synapse.name = lib.mkForce "matrix-synapse"; users.users.matrix-synapse.name = lib.mkForce "matrix-synapse";
} }

2
modules/packages.nix
View File

@ -25,7 +25,7 @@ in {
inherit (nur.balsoft.pkgs) termNote nix-patch; inherit (nur.balsoft.pkgs) termNote nix-patch;
inherit (old) mautrix-telegram; # inherit (old) mautrix-telegram;
inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher; inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher;

BIN
secret.nix
View File

Binary file not shown.