Grimmauld/grimm-nix-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch to t2bot fork for bridge, fix some misc

Browse source
This commit is contained in:
Grimmauld 2024-02-11 18:54:01 +01:00
parent 981abe57ec
commit d378dc39d9
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -203,11 +203,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1706718339, "lastModified": 1706826059,
"narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1706550542, "lastModified": 1706732774,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
modules/discord-matrix-bridge.nix
View file

@ -1,9 +1,16 @@
{config, lib, pkgs, ...}: let { config, lib, pkgs, ...}: let
root_host = "grimmauld.de"; root_host = "grimmauld.de";
bridge_port = 9005; # netstat -nlp | grep 9005 bridge_port = 9005; # netstat -nlp | grep 9005
in { in {
nixpkgs.overlays = [ (final: prev: { matrix-appservice-discord = prev.matrix-appservice-discord.overrideAttrs (old: { nixpkgs.overlays = [ (final: prev: { matrix-appservice-discord = prev.matrix-appservice-discord.overrideAttrs (old: {
src = pkgs.fetchFromGitHub {
owner = "t2bot";
repo = "matrix-appservice-discord";
rev = "8361ca6121bf1f0902154baa538cb6d5766e477f";
hash = "sha256-oXon6pFJgqQ1uBLtsSVNH7XSOpxxJYqpW2n9cFrs3sU=";
};
patches = (let oldPatches = old.patches or []; in if oldPatches == null then [] else oldPatches) ++ [ ./patch_bridge_perms.patch ]; patches = (let oldPatches = old.patches or []; in if oldPatches == null then [] else oldPatches) ++ [ ./patch_bridge_perms.patch ];
doCheck = false;
});}) });})
]; ];
@ -25,7 +32,7 @@ in {
disablePresence = true; disablePresence = true;
disableTypingNotifications = true; disableTypingNotifications = true;
}; };
logging.console = "silly"; # logging.console = "silly";
}; };
serviceDependencies = ["matrix-synapse.target"]; serviceDependencies = ["matrix-synapse.target"];
port = bridge_port; port = bridge_port;

1
modules/gitea.nix
View file

@ -14,6 +14,7 @@ in {
DISABLE_SSH = true; DISABLE_SSH = true;
}; };
# log.LEVEL = "Debug"; # log.LEVEL = "Debug";
"ssh.minimum_key_sizes".RSA = 2048;
}; };
lfs.enable = true; lfs.enable = true;
}; };