From f83d4613e756efad533de2a91197d5fa81e2a8d4 Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <contact@wanderingcrow.net>
Date: Sat, 4 Apr 2026 19:45:46 -0400
Subject: [PATCH] updates to unstable

---
 hosts/nixos/HandlerOne/default.nix  |  2 +-
 modules/services/matrix/default.nix | 35 -----------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/hosts/nixos/HandlerOne/default.nix b/hosts/nixos/HandlerOne/default.nix
index c717869..8a7f306 100644
--- a/hosts/nixos/HandlerOne/default.nix
+++ b/hosts/nixos/HandlerOne/default.nix
@@ -107,7 +107,7 @@
         "github.com/zhangjiayin/caddy-geoip2@v0.0.0-20251231005803-9e40d38250b4"
         "github.com/mholt/caddy-l4@v0.1.0"
       ];
-      hash = "sha256-Y9JcT1sUy+PxTLXnzBeiKlNVmddjWQRv6yKJyfa5fVk=";
+      hash = "sha256-KRdNtxU56F+jL+zgod6RqJDAMtomrz2xtBmbJG5zU3M=";
     };
     environmentFile = config.sops.templates."caddyserver-env".path;
     logFormat = ''
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index 21a89c0..2b1bc9b 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -6,26 +6,8 @@
 }:
 let
   sopsFolder = builtins.toString inputs.nix-secrets + "/sops";
-  fluffyconfig = pkgs.writeText "fluffychat-config.json" (
-    builtins.toJSON {
-      defaultHomeserver = "psychal.link";
-    }
-  );
-  customFluffy = pkgs.fluffychat-web.overrideAttrs (
-    final: prev: {
-
-      postInstall = ''
-        cp ${fluffyconfig} $out/config.json
-      '';
-    }
-  );
 in
 {
-  environment.systemPackages = [
-    customFluffy
-    pkgs.element-web
-  ];
-
   sops.secrets."matrix/registration_token" = {
     owner = "tuwunel";
     sopsFile = "${sopsFolder}/services.yaml";
@@ -54,21 +36,4 @@ in
   networking.firewall.allowedTCPPorts = [ 8448 ];
 
   users.users.caddy.extraGroups = [ "tuwunel" ];
-
-  services.caddy = {
-    enable = true;
-    virtualHosts = {
-      "psychal.link, psychal.link:8448".extraConfig = ''
-        reverse_proxy unix//run/tuwunel/tuwunel.sock
-      '';
-      "fl.psychal.link".extraConfig = ''
-        root * ${customFluffy}
-        file_server
-      '';
-      "em.psychal.link".extraConfig = ''
-        root * ${pkgs.element-web}
-        file_server
-      '';
-    };
-  };
 }