From c6249ebd8256cb48248fa7702762a74748f2a4c8 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Mon, 24 Feb 2025 22:52:40 -0500
Subject: [PATCH] Add Blox

---
 modules/extras/variables/domains/default.nix        |  1 +
 .../server/mailserver/simplenix/default.nix         | 13 +++++++++----
 .../server/minecraft/servers/roguecraft/default.nix |  6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/extras/variables/domains/default.nix b/modules/extras/variables/domains/default.nix
index e85880b..86e7987 100644
--- a/modules/extras/variables/domains/default.nix
+++ b/modules/extras/variables/domains/default.nix
@@ -8,6 +8,7 @@
   config.domains = {
     p1 = "jimbosfiles.com";
     p2 = "nixfox.ca";
+    blox = "bloxelcom.net";
     corn = "freecorn1854.win";
     luna = "lunamoonlight.xyz";
   };
diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index acb86fa..41cd3cf 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -8,8 +8,8 @@
   mailserver = rec {
     enable = config.system.mailserver.enable;
     domains = [
-      "${config.domains.p1}"
       "${config.domains.p2}"
+      "${config.domains.blox}"
       "${config.domains.luna}"
       "${config.domains.corn}"
     ];
@@ -27,7 +27,6 @@
       "jimbo@${config.domains.p2}" = {
         hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
         aliases = [
-          "jimbo@${config.domains.p1}"
           "james@${config.domains.p2}"
           "jimjam4real@${config.domains.p2}"
 
@@ -40,8 +39,14 @@
           "contact@${config.domains.p2}"
         ];
       };
-      "luna@${config.domains.luna}".hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
-      "corn@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
+      "luna@${config.domains.luna}" = {
+        hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
+        aliases = [ "luna@${config.domains.blox}" ];
+      };
+      "corn@${config.domains.corn}" = {
+        hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
+        aliases = [ "corn@${config.domains.blox}" ];
+      };
       "tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
     };
   };
diff --git a/modules/system/services/server/minecraft/servers/roguecraft/default.nix b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
index ad3c76a..4ae5ec6 100644
--- a/modules/system/services/server/minecraft/servers/roguecraft/default.nix
+++ b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
@@ -11,14 +11,14 @@ in {
         server-port = 30014;
         motd = "\\u00A7l\\u00A7bNixFox \\u00A7cRoguecraft \\u00A7bserver.";
         require-resource-pack = true;
-        resource-pack = "https://${config.domains.p1}/roguecraftresourcepackredir";
+        resource-pack = "https://${config.domains.p2}/roguecraftresourcepackredir";
         resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
       };
       whitelist = common.whitelist;
       symlinks = common.paperSymlinks;
       files = common.configFiles // {
         "world/datapacks/roguecraft.zip" = builtins.fetchurl {
-          url = "https://${config.domains.p1}/roguecraftdatapackredir";
+          url = "https://${config.domains.p2}/roguecraftdatapackredir";
           sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
         };
       };
@@ -26,7 +26,7 @@ in {
 
     ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable [ "rogue.${config.domains.p2}" ];
 
-    nginx.virtualHosts."${config.domains.p1}".locations = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable {
+    nginx.virtualHosts."${config.domains.p2}".locations = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable {
       "/roguecraftdatapackredir" = {
         return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
       };