From c6054649507415a6c7746f94417a10ae98ae61d0 Mon Sep 17 00:00:00 2001
From: Christine Elisabeth Koppel <kuutruu@posteo.net>
Date: Thu, 9 Apr 2026 00:46:46 +0300
Subject: [PATCH] Refactor Minecraft modpack configuration and update symlinks

---
 flake.nix                                     |  2 +-
 .../modules/system/minecraft.nix              | 42 ++++++-------------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index a7d1c5d..1ee1ae0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,7 +75,7 @@
         modules = [
           # Apply the overlay first so pkgs in later modules (like our local
           # `minecraft.nix`) see the extra helpers provided by the overlay
-          { nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; }
+          {nixpkgs.overlays = [inputs.nix-minecraft.overlay];}
 
           nix-minecraft.nixosModules.minecraft-servers
 
diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix
index 743bded..78ad93d 100644
--- a/nix-system-configs/modules/system/minecraft.nix
+++ b/nix-system-configs/modules/system/minecraft.nix
@@ -10,7 +10,7 @@
   # Try to use the nix-minecraft helper if the overlay is present; otherwise
   # fall back to a local path. If you use the fallback, ensure the path is an
   # unpacked modpack directory with `mods` and `config` subdirectories.
-  modpack = /srv/minecraft/modpacks/AllTheMods10-prg.mrpack;
+  modpack = /srv/minecraft/modpacks/atm10;
 in {
   options.local = {
     hostname = lib.mkOption {
@@ -70,7 +70,7 @@ in {
       eula = true;
       openFirewall = true;
 
-      servers.all-the-mods-ten-tss = {
+      servers.all-the-mods-tss = {
         enable = true;
         autoStart = true;
         restart = "always";
@@ -110,34 +110,16 @@ in {
           };
         };
 
-        #symlinks = {
-        #  "mods" = "${modpack}/overrides/mods";
-        #  "moddata" = "${modpack}/overrides/moddata";
-        #  "resourcepacks" = "${modpack}/overrides/resourcepacks";
-        #  "shaderpacks" = "${modpack}/overrides/shaderpacks";
-        #  "dynamic-resource-pack-cache" = "${modpack}/overrides/dynamic-resource-pack-cache";
-        #  "dynamic-data-pack-cache" = "${modpack}/overrides/dynamic-data-pack-cache";
-        #};
-        #files = {
-        #  "backup" = "${modpack}/overrides/backup";
-        #  "blueprints" = "${modpack}/overrides/blueprints";
-        #  "command_history.txt" = "${modpack}/overrides/command_history.txt";
-        #  "config" = "${modpack}/overrides/config";
-        #  "datapacks" = "${modpack}/overrides/datapacks";
-        #  "downloads" = "${modpack}/overrides/downloads";
-        #  "ESM" = "${modpack}/overrides/ESM";
-        #  "eula.txt" = "${modpack}/overrides/eula.txt";
-        #  "fancymenu_data" = "${modpack}/overrides/fancymenu_data";
-        #  "journeymap" = "${modpack}/overrides/journeymap";
-        #  "kubejs" = "${modpack}/overrides/kubejs";
-        #  "manifest.json" = "${modpack}/overrides/manifest.json";
-        #  "minecraftinstance.json" = "${modpack}/overrides/minecraftinstance.json";
-        #  "observable_announce" = "${modpack}/overrides/observable_announce";
-        #  "options.txt" = "${modpack}/overrides/options.txt";
-        #  "patchouli_books" = "${modpack}/overrides/patchouli_books";
-        #  "patchouli_data.json" = "${modpack}/overrides/patchouli_data.json";
-        #  "schematics" = "${modpack}/overrides/schematics";
-        #};
+        symlinks = {
+          "mods" = "${modpack}/mods";
+          "datapacks" = "${modpack}/datapacks";
+        };
+        files = {
+          "config" = "${modpack}/config";
+          "defaultconfigs" = "${modpack}/defaultconfigs";
+          "kubejs" = "${modpack}/kubejs";
+          "local" = "${modpack}/local";
+        };
       };
 
       servers.fabric-modded = {