remove conduwuit because it has been archived

nixos/configurations/Cape/default.nix

@@ -25,11 +25,6 @@
       };
       openssh.enable = true;
       tailscale.enable = true;
-      # conduwuit = {
-      #   enable = true;
-      #   serverName = "im.youthlic.fun";
-      # };
-      mautrix-telegram.enable = true;
       caddy = {
         enable = true;
         baseDomain = "youthlic.fun";

nixos/modules/programs/conduwuit.nix

@@ -1,61 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.youthlic.programs.conduwuit;
-in {
-  options = {
-    youthlic.programs.conduwuit = {
-      enable = lib.mkEnableOption "conduwuit";
-      serverName = lib.mkOption {
-        type = lib.types.nonEmptyStr;
-        example = "example.com";
-      };
-    };
-  };
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      sops.secrets."matrix-reg-token" = {
-        owner = "conduwuit";
-      };
-      systemd.services.conduwuit.serviceConfig = {
-        EnvironmentFile = "${config.sops.secrets.matrix-reg-token.path}";
-      };
-      services.conduwuit = {
-        enable = true;
-        settings = {
-          global = {
-            port = [8481];
-            address = [
-              "0.0.0.0"
-              "::"
-            ];
-            trusted_servers = [
-              "matrix.org"
-              "mozilla.org"
-              "nichi.co"
-            ];
-            allow_registration = true;
-            server_name = cfg.serverName;
-            new_user_displayname_suffix = "⚡";
-            allow_public_room_directory_over_federation = true;
-            well_known = {
-              client = "https://${cfg.serverName}";
-              server = "${cfg.serverName}:443";
-            };
-          };
-        };
-      };
-    })
-    (lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) {
-      services.caddy.virtualHosts = {
-        "${cfg.serverName}" = {
-          extraConfig = ''
-            reverse_proxy 127.0.0.1:8481
-          '';
-        };
-      };
-    })
-  ];
-}

nixos/modules/programs/default.nix

@@ -19,7 +19,6 @@
     ./steam.nix
     ./tailscale.nix
     ./transmission.nix
-    ./conduwuit.nix
     ./nix-ld.nix
     ./juicity
     ./miniflux.nix

nixos/modules/programs/mautrix-telegram.nix

@@ -10,54 +10,29 @@ in {
       enable = lib.mkEnableOption "mautrix-telegram";
     };
   };
-  config = let
+  config = lib.mkIf cfg.enable {
-    conduwuit-cfg = config.youthlic.programs.conduwuit;
+    sops.secrets.matrix-telegram-bot = {};
-    caddy-cfg = config.youthlic.programs.caddy;
+    services.mautrix-telegram = {
-  in
+      enable = true;
-    lib.mkMerge [
+      environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
-      (lib.mkIf cfg.enable {
+      settings = {
-        sops.secrets.matrix-telegram-bot = {};
+        bridge = {
-        services.mautrix-telegram = {
+          permissions = {
-          enable = true;
+            "*" = "relaybot";
-          environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
-          settings = {
-            bridge = {
-              permissions = {
-                "*" = "relaybot";
-              };
-            };
-            appservice = {
-              address = "http://127.0.0.1:8482";
-              hostname = "0.0.0.0";
-              port = 8482;
-              database = "sqlite:////var/lib/mautrix-telegram/database.db";
-              bot_username = "matrix_tg_146bot";
-              bot_displayname = "matrix tg bridge";
-            };
           };
         };
-        nixpkgs.config.permittedInsecurePackages = [
+        appservice = {
-          "olm-3.2.16"
+          address = "http://127.0.0.1:8482";
-        ];
+          hostname = "0.0.0.0";
-      })
+          port = 8482;
-      (lib.mkIf (cfg.enable && conduwuit-cfg.enable) {
+          database = "sqlite:////var/lib/mautrix-telegram/database.db";
-        services.mautrix-telegram = {
+          bot_username = "matrix_tg_146bot";
-          serviceDependencies = [
+          bot_displayname = "matrix tg bridge";
-            "conduwuit.service"
-          ];
-          settings = {
-            bridge = {
-              permissions = {
-                "${conduwuit-cfg.serverName}" = "full";
-                "@youthlic:${conduwuit-cfg.serverName}" = "admin";
-              };
-            };
-            homeserver = {
-              domain = conduwuit-cfg.serverName;
-              address = "http://127.0.0.1:8481";
-            };
-          };
         };
-      })
+      };
+    };
+    nixpkgs.config.permittedInsecurePackages = [
+      "olm-3.2.16"
     ];
+  };
 }