From af602d372af5a9571ca20b78765031a61ff69f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Thu, 3 Sep 2026 20:49:51 +0200
Subject: [PATCH] System Gen52 @ 2026-09-03-20:49:48 by jonas@harbor

---
 hosts/harbor/configuration.nix              |  5 -----
 modules/services/matrix.nix                 | 14 +++-----------
 secrets/harbor/ketesa_hs_ed25519_secret_key | 18 ------------------
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 secrets/harbor/ketesa_hs_ed25519_secret_key

diff --git a/hosts/harbor/configuration.nix b/hosts/harbor/configuration.nix
index 8262431..0f163fd 100644
--- a/hosts/harbor/configuration.nix
+++ b/hosts/harbor/configuration.nix
@@ -29,10 +29,6 @@
     owner = config.hive.gotify-instance.user;
     key = "adminPassword";
   };
-  sops.secrets.ketesa-hs-secret = {
-    format = "binary";
-    sopsFile = ../../secrets/harbor/ketesa_hs_ed25519_secret_key;
-  };
   sops.secrets.matrix-hs-secret = {
     format = "binary";
     sopsFile = ../../secrets/harbor/hs_ed25519_secret_key;
@@ -95,7 +91,6 @@
   hive.wg.server.enable = true;
   hive.wg.server.privateKeyFile = config.sops.secrets.wg-priv.path;
   hive.matrix.enable = true;
-  hive.matrix.ketesaHiddenServiceSecret = config.sops.secrets.ketesa-hs-secret.path;
   hive.matrix.hiddenServiceSecret = config.sops.secrets.matrix-hs-secret.path;
   hive.matrix.hiddenServiceHostnameSopsKey = config.sops.secrets.hidden-matrix-hostname.name;
   hive.calibre.enable = true;
diff --git a/modules/services/matrix.nix b/modules/services/matrix.nix
index 0877032..256ddfe 100644
--- a/modules/services/matrix.nix
+++ b/modules/services/matrix.nix
@@ -29,14 +29,11 @@
         type = lib.types.str;
         description = "The sops key of the secret containing the hostname of the hidden service";
       };
+
       hiddenServiceSecret = lib.mkOption {
         type = lib.types.path;
         description = "The file containing the hidden service's secret";
       };
-      ketesaHiddenServiceSecret = lib.mkOption {
-        type = lib.types.path;
-        description = "The file containing the ketesa hidden service's secret";
-      };
     };
 
     config = lib.mkIf cfg.enable {
@@ -60,14 +57,8 @@
                 port = cfg.localPort;
               };
             }
-          ];
-        };
-        relay.onionServices.ketesa = {
-          secretKey = cfg.ketesaHiddenServiceSecret;
-          version = 3;
-          map = [
             {
-              port = 80;
+              port = 8080;
               target = {
                 addr = "127.0.0.1";
                 port = cfg.ketesaLocalPort;
@@ -123,6 +114,7 @@
           report_stats = false;
           federation_domain_whitelist = [];
           federation_ip_range_blacklist = ["0.0.0.0/0"];
+          matrix_static_files_file_matrix_support_enabled = true;
         };
 
         extraConfigFiles = [
diff --git a/secrets/harbor/ketesa_hs_ed25519_secret_key b/secrets/harbor/ketesa_hs_ed25519_secret_key
deleted file mode 100644
index 32fe430..0000000
--- a/secrets/harbor/ketesa_hs_ed25519_secret_key
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:+BOkCDyX67+vmEPYdGM4im44QiLjFuC6reUU30WeUZRIy5aanyxrTYjFfdEF7g42RpB3zeZjOY5uhtfAnJZLggXz4whbKg8AqMZoBXuL14vniuklO0iubTyMChjQA2mm,iv:A1Lng4Qr0/KXGzrZXbDvwgYJI75ODT3py/oFXNtPQHk=,tag:eMwm4PtjJ6WfrXeX9vT/Jw==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxZ2xGVWY2OUo5dyttOXdv\nZmE5eTkwVkc5TWlPbVU1dDVQOXBzNTVzbzEwCmRBZEhtUm9PMG9zdExJNlhqU1hU\ndVRkM3BqVEVwVXdHOEYrNkpyL1FoTDgKLS0tIExEdHNFbFpWVWhpbWJsMmU1QzNH\nTXJpSmhJSnNpaEVxZ2RiTkExV2l5K0EKb+VLqFeQ2o/C674Rl6bfsOgRPqlW0U4B\nygPzyCpq0pZke0auLdeNYsvlI/+0D1LIVskWmGGClDVIyuCIvtnKZw==\n-----END AGE ENCRYPTED FILE-----\n",
-				"recipient": "age1wf0rq27v0n27zfy0es8ns3n25e2fdt063dgn68tt3f89rgrtu9csq4yhsp"
-			},
-			{
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwdjdkZVQ2MjMyNllnN0lE\naDhHVThXVmloU2d1UWk0NUl5MTZ3bHVVcFEwClNxdThxVUZmRkZRNlhxaXNkcExT\nU1AxbmJLS21CdVFhdVJmd2hNSW1pRDAKLS0tIHp0Q1Z3SGQ3V3h2eExmQjJyZGF5\nWUo2L1JuVFVnb3k1UktQc1R5R3E5KzQKk8FUGGAUNC2pd+kEYvA5LcB1hQv6nrtR\nNLD1wYap7mE4yBKnAfHUqilPmiPPYqeCZFuQ5v2YJe0TH6nWV0Hq7w==\n-----END AGE ENCRYPTED FILE-----\n",
-				"recipient": "age1expg8vyduf290pz7l4f3mjzvk9f0azfdn48pyjzs3m6p7v4qjq0qwtn36z"
-			}
-		],
-		"lastmodified": "2026-09-03T13:42:49Z",
-		"mac": "ENC[AES256_GCM,data:FY14QBkfIsPVkse+DzLEggDYRpuoqWh3KmTOghQLRSGMFdWJVYfc0ljSrFaiCf3qMojmLGmHStkcQ9fSmlYDJiK7Rk8DGehv76XH5OfWin9tulO6ll3acZqygxLthq2uqsFmfj4/kB6RnB2AAjMqS5NhUup+7vHgzriVEAX0Ti0=,iv:MCbYQy6I69Hfw+J5fkqpHC6ok5ZGt6+WiBTCHOOVZfU=,tag:yWQn8CYmGsbHxqD7ZyZwDQ==,type:str]",
-		"version": "3.13.3"
-	}
-}