add: matrix

nixos/hosts/fra1/default.nix

@@ -13,6 +13,7 @@
       nixosModules.services.doraim
       nixosModules.services.ntfy
       nixosModules.services.sogo
+      nixosModules.services.matrix
       (import nixosModules.services.keycloak { })
       (import nixosModules.services.vaultwarden { })
       (import nixosModules.services.alist { })

nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua

@@ -1,6 +1,6 @@
 return {
-	override_enabled = true,
-	worldgen_preset = "DST_CAVE",
-	settings_preset = "DST_CAVE",
-	overrides = {},
+  override_enabled = true,
+  worldgen_preset = "DST_CAVE",
+  settings_preset = "DST_CAVE",
+  overrides = {},
 }

nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua

@@ -1,4 +1,4 @@
 return {
-	override_enabled = true,
-	overrides = {},
+  override_enabled = true,
+  overrides = {},
 }

nixos/hosts/isk/_steam/dst/modoverrides.lua

@@ -1,20 +1,20 @@
 return {
-	--# Health Info
-	["workshop-375859599"] = { enabled = true },
-	--# Show Me
-	["workshop-2287303119"] = { enabled = true },
-	--# No Thermal Stone Durability
-	["workshop-466732225"] = { enabled = true },
-	--# Extra Equip Slots
-	["workshop-375850593"] = { enabled = true },
-	--# Display Attack Range
-	["workshop-2078243581"] = { enabled = true },
-	--# Increased Stack size
-	["workshop-374550642"] = { enabled = true },
-	--# Combined Status
-	["workshop-376333686"] = { enabled = true },
-	--# Global Positions
-	["workshop-378160973"] = { enabled = true },
-	--# Demon sword Muramasa
-	["workshop-1842087172"] = { enabled = true },
+  --# Health Info
+  ["workshop-375859599"] = { enabled = true },
+  --# Show Me
+  ["workshop-2287303119"] = { enabled = true },
+  --# No Thermal Stone Durability
+  ["workshop-466732225"] = { enabled = true },
+  --# Extra Equip Slots
+  ["workshop-375850593"] = { enabled = true },
+  --# Display Attack Range
+  ["workshop-2078243581"] = { enabled = true },
+  --# Increased Stack size
+  ["workshop-374550642"] = { enabled = true },
+  --# Combined Status
+  ["workshop-376333686"] = { enabled = true },
+  --# Global Positions
+  ["workshop-378160973"] = { enabled = true },
+  --# Demon sword Muramasa
+  ["workshop-1842087172"] = { enabled = true },
 }

nixos/modules/services/matrix.nix

@@ -230,7 +230,7 @@ lib.mkMerge [
           service = "element";
         };
         matrix-admin = {
-          rule = "Host(`m-admin.dora.im`)";
+          rule = "Host(`admin.m.dora.im`)";
           entryPoints = [ "https" ];
           service = "matrix-admin";
         };
@@ -261,7 +261,7 @@ lib.mkMerge [
           root = element-web-config;
         };
       };
-      virtualHosts."m-admin.*" = {
+      virtualHosts."admin.m.*" = {
         locations."/" = {
           root = pkgs.synapse-admin;
         };

terraform/cloudflare.tf

@@ -81,6 +81,8 @@ locals {
     atuin   = { on = "fra1", proxy = false }
     ntfy    = { on = "fra1", proxy = false }
     mail    = { on = "fra1", proxy = false }
+    m       = { on = "fra1", proxy = false }
+    admin.m = { on = "fra1", proxy = false }
     searx   = { on = "hkg4", proxy = false }
     morty   = { on = "hkg4", proxy = false }
   }