From 1f43844e904046b0d380549bf420fc2d480cd3d7 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Thu, 27 Nov 2025 01:17:38 -0600
Subject: [PATCH] feat: got minecraft servers sorted

---
 modules/config/instances/config/minecraft0.nix    | 5 ++---
 modules/config/instances/config/minecraft1.nix    | 5 ++---
 modules/nixos/guests/minecraft/default.nix        | 7 +++++++
 modules/nixos/guests/minecraft/world0/default.nix | 6 +++---
 modules/nixos/guests/minecraft/world1/default.nix | 6 +++---
 modules/nixos/guests/torrent/default.nix          | 3 +++
 modules/nixos/guests/website/default.nix          | 3 ---
 modules/nixos/guests/zookeeper/default.nix        | 6 ------
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/modules/config/instances/config/minecraft0.nix b/modules/config/instances/config/minecraft0.nix
index d98a977..7e43839 100755
--- a/modules/config/instances/config/minecraft0.nix
+++ b/modules/config/instances/config/minecraft0.nix
@@ -8,7 +8,6 @@ let
   label = "Minecraft";
   name = "minecraft";
   world = "world0";
-  secrets = "${secretPath}/${name}";
 in
 {
   label = label;
@@ -29,9 +28,9 @@ in
     path0 = "${varPath}/${name}";
   };
   mntPaths = {
-    path0 = "${mntPath}/${name}-${world}";
+    path0 = "${mntPath}/${name}/${world}";
   };
   secretPaths = {
-    path0 = secrets;
+    path0 = "${secretPath}/${name}";
   };
 }
diff --git a/modules/config/instances/config/minecraft1.nix b/modules/config/instances/config/minecraft1.nix
index e489804..c8759f0 100755
--- a/modules/config/instances/config/minecraft1.nix
+++ b/modules/config/instances/config/minecraft1.nix
@@ -8,7 +8,6 @@ let
   label = "Minecraft";
   name = "minecraft";
   world = "world1";
-  secrets = "${secretPath}/${name}";
 in
 {
   label = label;
@@ -29,9 +28,9 @@ in
     path0 = "${varPath}/${name}";
   };
   mntPaths = {
-    path0 = "${mntPath}/${name}-${world}";
+    path0 = "${mntPath}/${name}/${world}";
   };
   secretPaths = {
-    path0 = secrets;
+    path0 = "${secretPath}/${name}";
   };
 }
diff --git a/modules/nixos/guests/minecraft/default.nix b/modules/nixos/guests/minecraft/default.nix
index da65bd2..da27578 100755
--- a/modules/nixos/guests/minecraft/default.nix
+++ b/modules/nixos/guests/minecraft/default.nix
@@ -7,5 +7,12 @@ let
     map (name: ./. + "/${name}") dirContent;
 in
 {
+
+  systemd = {
+    tmpfiles.rules = [
+      "d /mnt/storage/minecraft 0751 microvm wheel - -"
+    ];
+  };
+
   imports = importList;
 }
diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix
index d07e9fd..8d467e5 100755
--- a/modules/nixos/guests/minecraft/world0/default.nix
+++ b/modules/nixos/guests/minecraft/world0/default.nix
@@ -154,15 +154,15 @@ in
               tag = "read_only_nix_store";
             }
             {
-              mountPoint = "/var/lib/${serviceCfg.name}";
+              mountPoint = serviceCfg.varPaths.path0;
               proto = "virtiofs";
               source = serviceCfg.mntPaths.path0;
-              tag = "${serviceCfg.name}_data";
+              tag = "${serviceCfg.name}-${world}_data";
             }
             {
               mountPoint = "/run/secrets";
               proto = "virtiofs";
-              source = "/run/secrets/${serviceCfg.name}";
+              source = serviceCfg.secretPaths.path0;
               tag = "host_secrets";
             }
           ];
diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index ea9ea3a..79ae7c5 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -152,15 +152,15 @@ in
               tag = "read_only_nix_store";
             }
             {
-              mountPoint = "/var/lib/${serviceCfg.name}";
+              mountPoint = serviceCfg.varPaths.path0;
               proto = "virtiofs";
               source = serviceCfg.mntPaths.path0;
-              tag = "${serviceCfg.name}_data";
+              tag = "${serviceCfg.name}-${world}_data";
             }
             {
               mountPoint = "/run/secrets";
               proto = "virtiofs";
-              source = "/run/secrets/${serviceCfg.name}";
+              source = serviceCfg.secretPaths.path0;
               tag = "host_secrets";
             }
           ];
diff --git a/modules/nixos/guests/torrent/default.nix b/modules/nixos/guests/torrent/default.nix
index 59b0683..64020b6 100755
--- a/modules/nixos/guests/torrent/default.nix
+++ b/modules/nixos/guests/torrent/default.nix
@@ -77,6 +77,9 @@ in
                 MaxConnectionsPerTorrent = -1;
                 MaxUploads = -1;
                 MaxUploadsPerTorrent = -1;
+                MaxActiveDownloads = -1;
+                MaxActiveUploads = -1;
+                MaxActiveTorrents = -1;
               };
             };
 
diff --git a/modules/nixos/guests/website/default.nix b/modules/nixos/guests/website/default.nix
index 8c63d4e..f873f93 100755
--- a/modules/nixos/guests/website/default.nix
+++ b/modules/nixos/guests/website/default.nix
@@ -77,7 +77,4 @@ in
     dnsProvider = instances.web.dns.provider0;
     environmentFile = config.sops.secrets."dns/${instances.web.dns.provider0}".path;
   };
-  systemd.tmpfiles.rules = [
-    "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -"
-  ];
 }
diff --git a/modules/nixos/guests/zookeeper/default.nix b/modules/nixos/guests/zookeeper/default.nix
index 8972802..069183c 100755
--- a/modules/nixos/guests/zookeeper/default.nix
+++ b/modules/nixos/guests/zookeeper/default.nix
@@ -106,12 +106,6 @@ in
     };
   };
 
-  systemd = {
-    tmpfiles.rules = [
-      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
-    ];
-  };
-
   sops.secrets = {
     "${serviceCfg.name}/env" = {
       owner = "root";