From fb113fd8c760da3f108af8dbb99bbab904508b56 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 18:05:09 -0600
Subject: [PATCH 01/10] feat: testing protonVPN

---
 modules/nixos/guests/torrent/default.nix | 11 +++++------
 secrets/secrets.yaml                     |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/nixos/guests/torrent/default.nix b/modules/nixos/guests/torrent/default.nix
index ffd1a4c..59b0683 100755
--- a/modules/nixos/guests/torrent/default.nix
+++ b/modules/nixos/guests/torrent/default.nix
@@ -11,7 +11,7 @@ let
   host = instances.torrent.domains.url0;
   dns0 = instances.web.dns.provider0;
   dns0Path = "dns/${dns0}";
-  torrentPort = 2049;
+  torrentPort = 51820;
 in
 {
   microvm.vms.${serviceCfg.name} = {
@@ -23,15 +23,14 @@ in
         wg-quick.interfaces = {
           wg0 = {
             address = [
-              "172.22.116.126/32"
-              "fd00:4956:504e:ffff::ac16:747e/128"
+              "10.2.0.2/32"
             ];
-            dns = [ "172.16.0.1" ];
+            dns = [ "10.2.0.1" ];
             privateKeyFile = "/run/secrets/wireguard-pass";
             peers = [
               {
-                publicKey = "hku9gjamhoii8OvxZgx+TdUDIkOAQYFu39qbav2AyUQ=";
-                endpoint = "89.187.181.116:${builtins.toString torrentPort}";
+                publicKey = "SFesR+3u5/vyQGeaCSREjs4m2WznwFlWAQ9CE3QSnRg=";
+                endpoint = "104.254.95.98:${builtins.toString torrentPort}";
                 allowedIPs = [
                   "0.0.0.0/0"
                   "::/0"
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index dc90627..1adc657 100755
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -55,7 +55,7 @@ firefly-iii:
     data: ENC[AES256_GCM,data:921LhcRTWVk24eEAQoDMV+RllSP3PbSXCCIDXlQA80Mq,iv:YXEgas77DgdyPTnBZa/ySjcERBIwmdDZJbijeNKNF24=,tag:Wj25wA7tLJ2bZ/faG9DUhg==,type:str]
     smtp: ENC[AES256_GCM,data:+e4MiRZ2WOZyWYpMf+By1Eb45ih4TA+svLI2+00yQk82,iv:+52+kJouMwkOSDEaOCA8V80+wT/VzNxgtCkOO68SCdk=,tag:YrtrJAXIhQpsUTEeYvrVwQ==,type:str]
 proton:
-    wireguard-pass: ENC[AES256_GCM,data:2SuLDMkJsOa/EjoYq0ZYp8A6yAO9KSaMJ35ofMXQDWhPcpL7/2eld83by021,iv:g5zGOdl2pGu3rsQcnwgRCHqDdzYNVkNhhfl3YMieBUY=,tag:FzbkDA4FyHrcC09EFZDoKw==,type:str]
+    wireguard-pass: ENC[AES256_GCM,data:nHks/AYJGEuv8Dk2DWi01dFlaZtB1YWUc6BgJ+hu4BPS5aNK86mQRV31dIGV,iv:ht2W1OaqQ6pVrqqKxvzPml2ShPusNNI0LBjiagWmdo4=,tag:OSzqYqxsHaDy+xNl2j8axQ==,type:str]
 backblaze:
     env: ENC[AES256_GCM,data:cdOYt77KocuGB3aqYz13oBokoLkEIgI1AW+cYC5uutgZYujG3PqoLEh6Gvbpzn3O+0OWg1/4UAYr4f2v7oCsgwFzPWS3HrhqC5+kIBjrPCyAnxDxlu2xaQ9hR+ogFh5UTDo=,iv:6+jx4Dj5CNV72DAss6NNYm44f9gSHco/EUBvL2o2CNI=,tag:6/cx84MgTDqQJxu/zINEeA==,type:str]
     repo: ENC[AES256_GCM,data:sRae9XELIfkWPaXelCdgEXIDbLTHVqGcRO0o+WA9aBfB8MUw92JjRCYgMgGXT0Apy38eszyuEHFB3XPpRmtQ7g==,iv:EilVA9zdHm6B9pTIhNxyj6Th1248nXvh0kpnEqZJ5HI=,tag:q9ASAgx5vgY0IePws4rT5Q==,type:str]
@@ -72,7 +72,7 @@ sops:
             bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD
             aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-11-26T08:19:12Z"
-    mac: ENC[AES256_GCM,data:eqsiEBdTva+rjC64+n/RhVqWT7q4QUfARAvqZCezVCAvoTFJ+qJO2PWrJ39H/axLcLTwq7xC36UYkN8ckvAUSLx8pZyyuHVeI+4irL16AIpJM8z14kYG6dyw0ujVI+JZpM57FHWXkwX6JtzbqN7sv+u/YnM6ubfmporykvlQOmQ=,iv:eYhCL11iv3B6jsGieJ7nosKcd6MUH1QBWjJptgjBhiQ=,tag:7W+bhwOHM7e0zCP7eP0jxQ==,type:str]
+    lastmodified: "2025-11-27T00:01:26Z"
+    mac: ENC[AES256_GCM,data:5/dhLmWLdSvpL69dd8/ZyARRvmb9GKv7DDaky0GZjXPf73LKl/tTeBqqMP99TFwXqXY3n9HdxuKwNIrIqMchw/CX1+SO3eBLQSffiS0T8tGwGa1RJf2YGYQupOyTrvBLPS3Qtxuo0JvlvGkxYStqUoM9ZFO2r46ZJPwAEHRPZN4=,iv:Dk1D29Zu5WpeeGXag1EsD1gWKoNchI7mkmOoJIUxf9A=,tag:RYc8f7eU19h4Z1Af9VbLOQ==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

From d92743dad40b100466f5a3be2075d5da72e01d81 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 18:55:48 -0600
Subject: [PATCH 02/10] feat: added proton client

---
 modules/home/cli/utilities/tshark/default.nix  |  0
 modules/home/default.nix                       |  2 ++
 modules/home/gui/apps/tools/proton/default.nix | 11 +++++++++++
 3 files changed, 13 insertions(+)
 mode change 100644 => 100755 modules/home/cli/utilities/tshark/default.nix
 create mode 100755 modules/home/gui/apps/tools/proton/default.nix

diff --git a/modules/home/cli/utilities/tshark/default.nix b/modules/home/cli/utilities/tshark/default.nix
old mode 100644
new mode 100755
diff --git a/modules/home/default.nix b/modules/home/default.nix
index a728511..b42f50e 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -57,6 +57,7 @@ in
             opencloud
             printManager
             prismLauncher
+            proton
             puddleTag
             scrcpy
             sharing
@@ -103,6 +104,7 @@ in
             okular
             printManager
             prismLauncher
+            proton
             scrcpy
             sharing
             signal
diff --git a/modules/home/gui/apps/tools/proton/default.nix b/modules/home/gui/apps/tools/proton/default.nix
new file mode 100755
index 0000000..6566642
--- /dev/null
+++ b/modules/home/gui/apps/tools/proton/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      protonvpn-gui
+      ;
+  };
+}

From a4e4f7526537e8f5bbe30582f525439996b5da91 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 21:40:17 -0600
Subject: [PATCH 03/10] feat: added another minecraft world

---
 .../config/{minecraft.nix => minecraft0.nix}  |   0
 .../config/instances/config/minecraft1.nix    |  38 ++++
 .../nixos/guests/minecraft/world0/default.nix |   2 +-
 .../nixos/guests/minecraft/world1/default.nix | 186 ++++++++++++++++++
 secrets/secrets.yaml                          |   5 +-
 5 files changed, 228 insertions(+), 3 deletions(-)
 rename modules/config/instances/config/{minecraft.nix => minecraft0.nix} (100%)
 create mode 100755 modules/config/instances/config/minecraft1.nix
 create mode 100755 modules/nixos/guests/minecraft/world1/default.nix

diff --git a/modules/config/instances/config/minecraft.nix b/modules/config/instances/config/minecraft0.nix
similarity index 100%
rename from modules/config/instances/config/minecraft.nix
rename to modules/config/instances/config/minecraft0.nix
diff --git a/modules/config/instances/config/minecraft1.nix b/modules/config/instances/config/minecraft1.nix
new file mode 100755
index 0000000..b4a4a75
--- /dev/null
+++ b/modules/config/instances/config/minecraft1.nix
@@ -0,0 +1,38 @@
+{ moduleFunctions }:
+let
+  inherit (moduleFunctions.instancesFunctions)
+    varPath
+    mntPath
+    secretPath
+    ;
+  label = "Minecraft";
+  name = "minecraft";
+  short = "mine";
+  secrets = "${secretPath}/${name}";
+in
+{
+  label = label;
+  name = name;
+  short = short;
+  ports = {
+    port0 = 43001;
+  };
+  interface = {
+    id = "vm-${short}";
+    mac = "02:00:00:00:51:42";
+    idUser = "vmuser-${short}";
+    macUser = "02:00:00:00:00:42";
+    ip = "192.168.50.142";
+    gate = "192.168.50.1";
+    ssh = 2402;
+  };
+  varPaths = {
+    path0 = "${varPath}/${name}";
+  };
+  mntPaths = {
+    path0 = "${mntPath}/${name}";
+  };
+  secretPaths = {
+    path0 = secrets;
+  };
+}
diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix
index c137de0..34c7d54 100755
--- a/modules/nixos/guests/minecraft/world0/default.nix
+++ b/modules/nixos/guests/minecraft/world0/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (flake.config.people) user0;
   inherit (flake.config.services) instances;
-  serviceCfg = instances.minecraft;
+  serviceCfg = instances.minecraft0;
   hostCfg = instances.web;
   world = "world0";
 in
diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
new file mode 100755
index 0000000..ab3f8b1
--- /dev/null
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -0,0 +1,186 @@
+{
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.people) user0;
+  inherit (flake.config.services) instances;
+  serviceCfg = instances.minecraft1;
+  hostCfg = instances.web;
+  world = "world1";
+in
+{
+  microvm.vms = {
+    "${serviceCfg.name}-${world}" = {
+      autostart = true;
+      restartIfChanged = true;
+      config = {
+        system.stateVersion = "24.05";
+        time.timeZone = "America/Winnipeg";
+        users.users.root.openssh.authorizedKeys.keys = flake.config.people.users.${user0}.sshKeys;
+        services = {
+          minecraft-server = {
+            enable = true;
+            eula = true;
+            openFirewall = true;
+            declarative = true;
+            serverProperties = {
+              "rcon.password" = "/etc/${serviceCfg.name}-secrets/${world}";
+              allow-flight = false;
+              allow-nether = true;
+              difficulty = 2;
+              enable-command-block = false;
+              enable-rcon = true;
+              enable-status = true;
+              force-gamemode = true;
+              gamemode = 0;
+              generate-structures = true;
+              hardcore = false;
+              hide-online-players = false;
+              level-name = "CuddleCubes";
+              level-seed = "-2332803749585407299";
+              max-players = 2;
+              max-world-size = 64000000;
+              motd = "A cool Minecraft server powered by NixOS";
+              online-mode = true;
+              pvp = true;
+              server-ip = hostCfg.localhost.address1;
+              server-port = serviceCfg.ports.port0;
+              spawn-animals = true;
+              spawn-monsters = true;
+              spawn-npcs = true;
+              spawn-protection = 16;
+              view-distance = 32;
+              white-list = true;
+            };
+            whitelist = {
+              Hefty_Chungus = "b75a9816-d408-4c54-b226-385b59ea1cb3";
+              Fallaryn = "d8baa117-ab58-4b07-92a5-48fb1978eb49";
+            };
+          };
+
+          openssh = {
+            enable = true;
+            settings = {
+              PasswordAuthentication = false;
+              PermitRootLogin = "prohibit-password";
+            };
+          };
+        };
+
+        networking.firewall.allowedTCPPorts = [
+          22 # SSH
+          serviceCfg.ports.port0
+        ];
+
+        systemd = {
+          services = {
+            "${serviceCfg.name}-copy-secrets" = {
+              description = "Copy secrets from virtiofs to local filesystem";
+              before = [ "minecraft-server.service" ];
+              requiredBy = [ "minecraft-server.service" ];
+
+              serviceConfig = {
+                Type = "oneshot";
+                RemainAfterExit = true;
+              };
+              script = ''
+                mkdir -p /etc/${serviceCfg.name}-secrets
+                cp /run/secrets/${world} /etc/${serviceCfg.name}-secrets/${world}
+                chmod 755 /etc/${serviceCfg.name}-secrets
+                chmod 644 /etc/${serviceCfg.name}-secrets/*
+              '';
+            };
+
+          };
+          network = {
+            enable = true;
+            networks."20-lan" = {
+              matchConfig.Name = "enp0s5";
+              addresses = [
+                { Address = "${serviceCfg.interface.ip}/24"; }
+              ];
+              routes = [
+                {
+                  Destination = "${hostCfg.localhost.address1}/0";
+                  Gateway = serviceCfg.interface.gate;
+                }
+              ];
+              dns = [
+                "1.1.1.1"
+                "8.8.8.8"
+              ];
+            };
+          };
+
+          tmpfiles.rules = [
+            "Z ${serviceCfg.varPaths.path0} 0755 ${serviceCfg.name} ${serviceCfg.name} -"
+          ];
+
+        };
+
+        systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ];
+
+        microvm = {
+          vcpu = 2;
+          mem = 1024 * 3;
+          hypervisor = "qemu";
+          interfaces = [
+            {
+              type = "tap";
+              id = serviceCfg.interface.id;
+              mac = serviceCfg.interface.mac;
+            }
+            {
+              type = "user";
+              id = serviceCfg.interface.idUser;
+              mac = serviceCfg.interface.macUser;
+            }
+          ];
+          forwardPorts = [
+            {
+              from = "host";
+              host.port = serviceCfg.interface.ssh;
+              guest.port = 22;
+            }
+          ];
+          shares = [
+            {
+              mountPoint = "/nix/.ro-store";
+              proto = "virtiofs";
+              source = "/nix/store";
+              tag = "read_only_nix_store";
+            }
+            {
+              mountPoint = "/var/lib/${serviceCfg.name}";
+              proto = "virtiofs";
+              source = serviceCfg.mntPaths.path0;
+              tag = "${serviceCfg.name}_data";
+            }
+            {
+              mountPoint = "/run/secrets";
+              proto = "virtiofs";
+              source = "/run/secrets/${serviceCfg.name}";
+              tag = "host_secrets";
+            }
+          ];
+        };
+      };
+    };
+  };
+
+  systemd = {
+    tmpfiles.rules = [
+      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
+    ];
+  };
+
+  sops.secrets = {
+    "${serviceCfg.name}/${world}" = {
+      owner = "root";
+      mode = "0600";
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ serviceCfg.ports.port0 ];
+}
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 1adc657..5a8f20d 100755
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -24,6 +24,7 @@ zookeeper:
     env: ENC[AES256_GCM,data:CEEUmzRxvyeXSQfwUkmZq46HQNkv3I+wMzkBoUpAlh3D5O3L5kCeoDksDWuQrVTeQfIwKj18LDeeG+2Bz5XOVPTyXm/Ap+m2Jw==,iv:6eX7ocY5PiQaJ0KBDiKxhx0UguuQWcIbiZSYHY2hHjU=,tag:6vXg2fzRyfuJd5G3yNeUNA==,type:str]
 minecraft:
     world0: ENC[AES256_GCM,data:pz7P5g9jRL8KaARfSs2ddmN76ioKSuSv7A==,iv:ZFIhS15BPxHzTW4aPpT7A8R4rxuyNNGjPJXqJXYoBpk=,tag:aymiUs87YR519eZN8Aopyw==,type:str]
+    world1: ENC[AES256_GCM,data:vvMvvGlyrrufdoeiTWYUcKoYSyMtuOyQ2A2xPB0V81IM,iv:gQWuyxqcSTvrgKbhKlu8dZbBj0zqGImyB+W2ZufRyJc=,tag:ykPgGmRAEZl3M3HrEdE5Aw==,type:str]
 vaultwarden:
     env: ENC[AES256_GCM,data:1MzIqnV/PCGNNqKVwhxZfmV92vRQsn3OxuvCXUtKyCmoA2xxD91U3EmMikTqM3EOHYAMHbF66YgQC5JjivbIF06OCeXMMLpGuN8ibCUQq7M6PQ34/LDMZnqynmC3/U0FJglSU7o1KA0=,iv:novSYG6j0l17xogdE5WiS2gNPNAVKeX9lgxe5EohBHk=,tag:w43z7a/MzObvVTQh8AiSTA==,type:str]
 dns:
@@ -72,7 +73,7 @@ sops:
             bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD
             aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-11-27T00:01:26Z"
-    mac: ENC[AES256_GCM,data:5/dhLmWLdSvpL69dd8/ZyARRvmb9GKv7DDaky0GZjXPf73LKl/tTeBqqMP99TFwXqXY3n9HdxuKwNIrIqMchw/CX1+SO3eBLQSffiS0T8tGwGa1RJf2YGYQupOyTrvBLPS3Qtxuo0JvlvGkxYStqUoM9ZFO2r46ZJPwAEHRPZN4=,iv:Dk1D29Zu5WpeeGXag1EsD1gWKoNchI7mkmOoJIUxf9A=,tag:RYc8f7eU19h4Z1Af9VbLOQ==,type:str]
+    lastmodified: "2025-11-27T03:39:51Z"
+    mac: ENC[AES256_GCM,data:EdxVM3/0cvMX5cumM+LDn5/qgOCMB6uySunlvEkPy3GHG3dHULc4MAw7bgI9DZ8Y0R26ipBzTKEoWWIIwCLcT+r6KwCM/HVg7gjuY+YbEnU71jivAKNg902Ue8LWNSKLvw1kAHkgtT/jPuMTuHShBTNTYeTsW5mGsqcXhdWVWC4=,iv:A3xeAtFwn4i7ijOA/vZ+XJ9jUeyt1FrvvKrGg5SeyAM=,tag:C7PuVjmYcjFB/u5Hi22aWg==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

From 6f4260e9e46beade0adede3cd2e078a44e6ed640 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 21:48:46 -0600
Subject: [PATCH 04/10] feat: added another minecraft world

---
 modules/config/instances/config/minecraft0.nix    | 2 +-
 modules/config/instances/config/minecraft1.nix    | 2 +-
 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/services/restic/default.nix         | 3 ++-
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/config/instances/config/minecraft0.nix b/modules/config/instances/config/minecraft0.nix
index e33ed15..19df36d 100755
--- a/modules/config/instances/config/minecraft0.nix
+++ b/modules/config/instances/config/minecraft0.nix
@@ -7,7 +7,7 @@ let
     ;
   label = "Minecraft";
   name = "minecraft";
-  short = "mine";
+  short = "mine0";
   secrets = "${secretPath}/${name}";
 in
 {
diff --git a/modules/config/instances/config/minecraft1.nix b/modules/config/instances/config/minecraft1.nix
index b4a4a75..9994136 100755
--- a/modules/config/instances/config/minecraft1.nix
+++ b/modules/config/instances/config/minecraft1.nix
@@ -7,7 +7,7 @@ let
     ;
   label = "Minecraft";
   name = "minecraft";
-  short = "mine";
+  short = "mine1";
   secrets = "${secretPath}/${name}";
 in
 {
diff --git a/modules/nixos/guests/minecraft/default.nix b/modules/nixos/guests/minecraft/default.nix
index da65bd2..6cab322 100755
--- a/modules/nixos/guests/minecraft/default.nix
+++ b/modules/nixos/guests/minecraft/default.nix
@@ -8,4 +8,11 @@ let
 in
 {
   imports = importList;
+
+  systemd = {
+    tmpfiles.rules = [
+      "d /mnt/storage/minecraft 0751 microvm wheel - -"
+    ];
+  };
+
 }
diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix
index 34c7d54..1e702aa 100755
--- a/modules/nixos/guests/minecraft/world0/default.nix
+++ b/modules/nixos/guests/minecraft/world0/default.nix
@@ -171,12 +171,6 @@ in
     };
   };
 
-  systemd = {
-    tmpfiles.rules = [
-      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
-    ];
-  };
-
   sops.secrets = {
     "${serviceCfg.name}/${world}" = {
       owner = "root";
diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index ab3f8b1..e7cbfd1 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -169,12 +169,6 @@ in
     };
   };
 
-  systemd = {
-    tmpfiles.rules = [
-      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
-    ];
-  };
-
   sops.secrets = {
     "${serviceCfg.name}/${world}" = {
       owner = "root";
diff --git a/modules/nixos/services/restic/default.nix b/modules/nixos/services/restic/default.nix
index fcf2e9e..76a9b60 100755
--- a/modules/nixos/services/restic/default.nix
+++ b/modules/nixos/services/restic/default.nix
@@ -28,7 +28,8 @@ in
           instances.firefly-iii.mntPaths.path0
           instances.forgejo.mntPaths.path0
           instances.mastodon.mntPaths.path0
-          instances.minecraft.mntPaths.path0
+          instances.minecraft0.mntPaths.path0
+          instances.minecraft1.mntPaths.path0
           instances.opencloud.mntPaths.path0
           instances.vaultwarden.mntPaths.path0
           "${instances.jellyfin.mntPaths.path0}/cache"

From 5b00235743260d926d73607ed59e5d27b840d4ad Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 21:49:47 -0600
Subject: [PATCH 05/10] feat: added another minecraft world

---
 modules/nixos/services/restic/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/nixos/services/restic/default.nix b/modules/nixos/services/restic/default.nix
index 76a9b60..a484f42 100755
--- a/modules/nixos/services/restic/default.nix
+++ b/modules/nixos/services/restic/default.nix
@@ -25,11 +25,10 @@ in
         };
         paths = [
           "/home/${user0}/.ssh"
+          "/mnt/storage/minecraft"
           instances.firefly-iii.mntPaths.path0
           instances.forgejo.mntPaths.path0
           instances.mastodon.mntPaths.path0
-          instances.minecraft0.mntPaths.path0
-          instances.minecraft1.mntPaths.path0
           instances.opencloud.mntPaths.path0
           instances.vaultwarden.mntPaths.path0
           "${instances.jellyfin.mntPaths.path0}/cache"

From 710bc42aef2855dcc45266c1deaf11cce7c0466b Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 22:34:04 -0600
Subject: [PATCH 06/10] feat: added another minecraft world

---
 .../config/instances/config/minecraft0.nix    |  9 +++---
 .../config/instances/config/minecraft1.nix    |  9 +++---
 modules/nixos/guests/minecraft/default.nix    |  7 -----
 .../nixos/guests/minecraft/world0/default.nix |  9 +++++-
 .../nixos/guests/minecraft/world1/default.nix | 15 +++++++---
 modules/nixos/services/restic/default.nix     | 29 +++++++++++--------
 6 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/modules/config/instances/config/minecraft0.nix b/modules/config/instances/config/minecraft0.nix
index 19df36d..d98a977 100755
--- a/modules/config/instances/config/minecraft0.nix
+++ b/modules/config/instances/config/minecraft0.nix
@@ -7,20 +7,19 @@ let
     ;
   label = "Minecraft";
   name = "minecraft";
-  short = "mine0";
+  world = "world0";
   secrets = "${secretPath}/${name}";
 in
 {
   label = label;
   name = name;
-  short = short;
   ports = {
     port0 = 43000;
   };
   interface = {
-    id = "vm-${short}";
+    id = "vm-${world}";
     mac = "02:00:00:00:51:41";
-    idUser = "vmuser-${short}";
+    idUser = "vmuser-${world}";
     macUser = "02:00:00:00:00:41";
     ip = "192.168.50.141";
     gate = "192.168.50.1";
@@ -30,7 +29,7 @@ in
     path0 = "${varPath}/${name}";
   };
   mntPaths = {
-    path0 = "${mntPath}/${name}";
+    path0 = "${mntPath}/${name}-${world}";
   };
   secretPaths = {
     path0 = secrets;
diff --git a/modules/config/instances/config/minecraft1.nix b/modules/config/instances/config/minecraft1.nix
index 9994136..e489804 100755
--- a/modules/config/instances/config/minecraft1.nix
+++ b/modules/config/instances/config/minecraft1.nix
@@ -7,20 +7,19 @@ let
     ;
   label = "Minecraft";
   name = "minecraft";
-  short = "mine1";
+  world = "world1";
   secrets = "${secretPath}/${name}";
 in
 {
   label = label;
   name = name;
-  short = short;
   ports = {
     port0 = 43001;
   };
   interface = {
-    id = "vm-${short}";
+    id = "vm-${world}";
     mac = "02:00:00:00:51:42";
-    idUser = "vmuser-${short}";
+    idUser = "vmuser-${world}";
     macUser = "02:00:00:00:00:42";
     ip = "192.168.50.142";
     gate = "192.168.50.1";
@@ -30,7 +29,7 @@ in
     path0 = "${varPath}/${name}";
   };
   mntPaths = {
-    path0 = "${mntPath}/${name}";
+    path0 = "${mntPath}/${name}-${world}";
   };
   secretPaths = {
     path0 = secrets;
diff --git a/modules/nixos/guests/minecraft/default.nix b/modules/nixos/guests/minecraft/default.nix
index 6cab322..da65bd2 100755
--- a/modules/nixos/guests/minecraft/default.nix
+++ b/modules/nixos/guests/minecraft/default.nix
@@ -8,11 +8,4 @@ let
 in
 {
   imports = importList;
-
-  systemd = {
-    tmpfiles.rules = [
-      "d /mnt/storage/minecraft 0751 microvm wheel - -"
-    ];
-  };
-
 }
diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix
index 1e702aa..41e23e2 100755
--- a/modules/nixos/guests/minecraft/world0/default.nix
+++ b/modules/nixos/guests/minecraft/world0/default.nix
@@ -25,7 +25,7 @@ in
             openFirewall = true;
             declarative = true;
             serverProperties = {
-              "rcon.password" = "/etc/${serviceCfg.name}-secrets/${world}";
+              "rcon.password" = "/run/secrets/${world}";
               allow-flight = false;
               allow-nether = true;
               difficulty = 2;
@@ -179,4 +179,11 @@ in
   };
 
   networking.firewall.allowedTCPPorts = [ serviceCfg.ports.port0 ];
+
+  systemd = {
+    tmpfiles.rules = [
+      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
+    ];
+  };
+
 }
diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index e7cbfd1..d4c75c7 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (flake.config.people) user0;
   inherit (flake.config.services) instances;
-  serviceCfg = instances.minecraft1;
+  serviceCfg = instances.minecraft0;
   hostCfg = instances.web;
   world = "world1";
 in
@@ -25,7 +25,7 @@ in
             openFirewall = true;
             declarative = true;
             serverProperties = {
-              "rcon.password" = "/etc/${serviceCfg.name}-secrets/${world}";
+              "rcon.password" = "/run/secrets/${world}";
               allow-flight = false;
               allow-nether = true;
               difficulty = 2;
@@ -37,9 +37,9 @@ in
               generate-structures = true;
               hardcore = false;
               hide-online-players = false;
-              level-name = "CuddleCubes";
+              level-name = "Brix on Nix";
               level-seed = "-2332803749585407299";
-              max-players = 2;
+              max-players = 10;
               max-world-size = 64000000;
               motd = "A cool Minecraft server powered by NixOS";
               online-mode = true;
@@ -177,4 +177,11 @@ in
   };
 
   networking.firewall.allowedTCPPorts = [ serviceCfg.ports.port0 ];
+
+  systemd = {
+    tmpfiles.rules = [
+      "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -"
+    ];
+  };
+
 }
diff --git a/modules/nixos/services/restic/default.nix b/modules/nixos/services/restic/default.nix
index a484f42..2c1ab9b 100755
--- a/modules/nixos/services/restic/default.nix
+++ b/modules/nixos/services/restic/default.nix
@@ -23,18 +23,23 @@ in
           OnCalendar = "0/4:00";
           Persistent = true;
         };
-        paths = [
-          "/home/${user0}/.ssh"
-          "/mnt/storage/minecraft"
-          instances.firefly-iii.mntPaths.path0
-          instances.forgejo.mntPaths.path0
-          instances.mastodon.mntPaths.path0
-          instances.opencloud.mntPaths.path0
-          instances.vaultwarden.mntPaths.path0
-          "${instances.jellyfin.mntPaths.path0}/cache"
-          "${instances.jellyfin.mntPaths.path0}/data"
-          "${instances.jellyfin.mntPaths.path0}/media/music"
-        ];
+        paths =
+          let
+            instanceHelper = instance: instances.${instance}.mntPaths.path0;
+          in
+          [
+            "/home/${user0}/.ssh"
+            (instanceHelper "firefly-iii")
+            (instanceHelper "forgejo")
+            (instanceHelper "mastodon")
+            (instanceHelper "opencloud")
+            (instanceHelper "minecraft0")
+            (instanceHelper "minecraft1")
+            (instanceHelper "vaultwarden")
+            ((instanceHelper "jellyfin") + "/cache")
+            ((instanceHelper "jellyfin") + "/data")
+            ((instanceHelper "jellyfin") + "/media/music")
+          ];
       };
     };
   };

From 6e0338dccbbf239fd2cc028105260843d156dcfe Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 22:40:57 -0600
Subject: [PATCH 07/10] feat: added another minecraft world

---
 modules/nixos/guests/minecraft/world1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index d4c75c7..78ca281 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (flake.config.people) user0;
   inherit (flake.config.services) instances;
-  serviceCfg = instances.minecraft0;
+  serviceCfg = instances.minecraft1;
   hostCfg = instances.web;
   world = "world1";
 in

From 301ba9c6e505938d298135baf28684555e79b1a0 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 22:48:59 -0600
Subject: [PATCH 08/10] feat: added another minecraft world

---
 modules/nixos/guests/minecraft/world0/default.nix | 2 +-
 modules/nixos/guests/minecraft/world1/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix
index 41e23e2..d07e9fd 100755
--- a/modules/nixos/guests/minecraft/world0/default.nix
+++ b/modules/nixos/guests/minecraft/world0/default.nix
@@ -25,7 +25,7 @@ in
             openFirewall = true;
             declarative = true;
             serverProperties = {
-              "rcon.password" = "/run/secrets/${world}";
+              "rcon.password" = "/etc/${serviceCfg.name}-secrets/${world}";
               allow-flight = false;
               allow-nether = true;
               difficulty = 2;
diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index 78ca281..42f29c0 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -25,7 +25,7 @@ in
             openFirewall = true;
             declarative = true;
             serverProperties = {
-              "rcon.password" = "/run/secrets/${world}";
+              "rcon.password" = "/etc/${serviceCfg.name}-secrets/${world}";
               allow-flight = false;
               allow-nether = true;
               difficulty = 2;

From 4c3ab7728cbcbc1a2a9f095a4214c1c2ae4bc60a Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 26 Nov 2025 23:13:08 -0600
Subject: [PATCH 09/10] feat: added another minecraft world

---
 modules/nixos/guests/minecraft/world1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nixos/guests/minecraft/world1/default.nix b/modules/nixos/guests/minecraft/world1/default.nix
index 42f29c0..ea9ea3a 100755
--- a/modules/nixos/guests/minecraft/world1/default.nix
+++ b/modules/nixos/guests/minecraft/world1/default.nix
@@ -37,7 +37,7 @@ in
               generate-structures = true;
               hardcore = false;
               hide-online-players = false;
-              level-name = "Brix on Nix";
+              level-name = "Cuddle Cubes";
               level-seed = "-2332803749585407299";
               max-players = 10;
               max-world-size = 64000000;

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 10/10] 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";