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] 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"