From d378dc39d9b7a0e6143827737d87c705ccefd648 Mon Sep 17 00:00:00 2001
From: Grimmauld <soeren@benjos.de>
Date: Sun, 11 Feb 2024 18:54:01 +0100
Subject: [PATCH] switch to t2bot fork for bridge, fix some misc

---
 flake.lock                        | 12 ++++++------
 modules/discord-matrix-bridge.nix | 11 +++++++++--
 modules/gitea.nix                 |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8d820b3..6646eb6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -203,11 +203,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1706718339,
-        "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=",
+        "lastModified": 1706826059,
+        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2",
+        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1706732774,
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
         "type": "github"
       },
       "original": {
diff --git a/modules/discord-matrix-bridge.nix b/modules/discord-matrix-bridge.nix
index 8441fcc..edb26fc 100644
--- a/modules/discord-matrix-bridge.nix
+++ b/modules/discord-matrix-bridge.nix
@@ -1,9 +1,16 @@
-{config, lib, pkgs, ...}: let
+{ config, lib, pkgs, ...}: let
   root_host = "grimmauld.de";
   bridge_port = 9005; # netstat -nlp | grep 9005
 in {
   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 ];
+      doCheck = false;
     });})
   ];
 
@@ -25,7 +32,7 @@ in {
         disablePresence = true;
         disableTypingNotifications = true;
       };
-      logging.console = "silly";
+#      logging.console = "silly";
     };
     serviceDependencies = ["matrix-synapse.target"];
     port = bridge_port;
diff --git a/modules/gitea.nix b/modules/gitea.nix
index 2e23e39..6b43e19 100644
--- a/modules/gitea.nix
+++ b/modules/gitea.nix
@@ -14,6 +14,7 @@ in {
         DISABLE_SSH = true;
       };
 #      log.LEVEL = "Debug";
+      "ssh.minimum_key_sizes".RSA = 2048;
     };
     lfs.enable = true;
   };