From 39320d987cadf2b4899369b5a979eae5f9f06b1d Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Tue, 12 Mar 2024 12:34:20 +0100
Subject: [PATCH] matrix: move into folder

---
 flake.nix                                  | 5 ++---
 modules/{matrix.nix => matrix/default.nix} | 1 +
 modules/{ => matrix}/mautrix-telegram.nix  | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/{matrix.nix => matrix/default.nix} (99%)
 rename modules/{ => matrix}/mautrix-telegram.nix (100%)

diff --git a/flake.nix b/flake.nix
index 97cf582..e55c42f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -78,14 +78,13 @@
             ./modules/mail
             ./modules/web
             ./modules/courses
+            ./modules/wiki
+            ./modules/matrix
 
             ./modules/nix-serve.nix
             ./modules/hedgedoc.nix
             ./modules/padlist.nix
-            ./modules/wiki
             ./modules/nextcloud.nix
-            ./modules/matrix.nix
-            ./modules/mautrix-telegram.nix
             ./modules/vaultwarden.nix
             ./modules/gitea.nix
             ./modules/kanboard.nix
diff --git a/modules/matrix.nix b/modules/matrix/default.nix
similarity index 99%
rename from modules/matrix.nix
rename to modules/matrix/default.nix
index bd23979..95fd87d 100644
--- a/modules/matrix.nix
+++ b/modules/matrix/default.nix
@@ -22,6 +22,7 @@ let
   matrix-synapse-ldap3 = config.services.matrix-synapse.package.plugins.matrix-synapse-ldap3;
 in
 {
+  imports = [ ./mautrix-telegram.nix ];
   sops.secrets.matrix_ldap_search = {
     key = "portunus/search-password";
     owner = config.systemd.services.matrix-synapse.serviceConfig.User;
diff --git a/modules/mautrix-telegram.nix b/modules/matrix/mautrix-telegram.nix
similarity index 100%
rename from modules/mautrix-telegram.nix
rename to modules/matrix/mautrix-telegram.nix