From a6bc09caac08e67d4c13ba180551f42236412db1 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 13:08:33 +0300 Subject: [PATCH 1/7] Adjust JVM memory settings for Minecraft server configuration --- nix-system-configs/modules/system/minecraft.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 16f7359..3785220 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -78,9 +78,8 @@ in { package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_220; jvmOpts = lib.concatStringsSep " " [ - "-Xms28G" - # Use 120GB of RA - "-Xmx32G" + "-Xms18G" + "-Xmx45G" ]; serverProperties = { @@ -133,7 +132,7 @@ in { jvmOpts = lib.concatStringsSep " " [ "-Xms54G" # Use 120GB of RA - "-Xmx120G" + "-Xmx70G" "-XX:+UseG1GC" "-XX:+ParallelRefProcEnabled" From 77019e53d35e27c3ec9d9b71617d8d7190e58377 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 13:31:33 +0300 Subject: [PATCH 2/7] Force agree eula --- nix-system-configs/modules/system/minecraft.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 3785220..48247f6 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -117,6 +117,7 @@ in { "config" = "${modpack}/overrides/config"; "kubejs" = "${modpack}/overrides/kubejs"; "datapacks" = "${modpack}/overrides/datapacks"; + "eula.txt" = "${modpack}/overrides/eula.txt"; }; }; From 5be9428e49e15f5e94efbc303c1d148eda95a57b Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 13:37:15 +0300 Subject: [PATCH 3/7] Force swap the package --- nix-system-configs/modules/system/minecraft.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 48247f6..57834bb 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -70,7 +70,7 @@ in { eula = true; openFirewall = true; - servers.all-the-mods-ten = { + servers.all-the-mods-ten-tss = { enable = true; autoStart = true; restart = "always"; From 91783bb8d97312ec2f66247e965a29f3ee6d583d Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 13:48:56 +0300 Subject: [PATCH 4/7] Update Minecraft server package version to neoforge-1_21_1-21_1_222 --- nix-system-configs/modules/system/minecraft.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 57834bb..8e26e85 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -75,7 +75,7 @@ in { autoStart = true; restart = "always"; - package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_220; + package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_222; jvmOpts = lib.concatStringsSep " " [ "-Xms18G" From ab3177ddca10e37061dc34b738c52f3b7ed7c9cb Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 14:19:04 +0300 Subject: [PATCH 5/7] Update Minecraft server package version to neoforge-1_21_1-21_1_224 and add flake input update step --- nix-system-configs/modules/scripts/pull.zsh | 9 +++++++++ nix-system-configs/modules/system/minecraft.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nix-system-configs/modules/scripts/pull.zsh b/nix-system-configs/modules/scripts/pull.zsh index 42554bf..72f5051 100755 --- a/nix-system-configs/modules/scripts/pull.zsh +++ b/nix-system-configs/modules/scripts/pull.zsh @@ -198,6 +198,15 @@ else exit 1 fi +# Step 3.1: Update the flake inputs, always +print_info "Updating flake inputs..." +if nix flake update; then + print_success "Flake inputs updated" +else + print_error "Failed to update flake inputs" + exit 1 +fi + # Step 4: Rebuild system using local flake # Compute repository root (three levels up from this script: .../nix-system-configs/modules/scripts -> repo root) FLAKE_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)" diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 8e26e85..3ac12f0 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -75,7 +75,7 @@ in { autoStart = true; restart = "always"; - package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_222; + package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_224; jvmOpts = lib.concatStringsSep " " [ "-Xms18G" From 77bac2bda3d0ba6fc3d49aac53df4306f864d31e Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 14:40:48 +0300 Subject: [PATCH 6/7] Add additional symlinks and files for Minecraft modpack overrides --- .../modules/system/minecraft.nix | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 3ac12f0..cfb0cdc 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -112,12 +112,33 @@ 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"; - "kubejs" = "${modpack}/overrides/kubejs"; "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"; + "local" = "${modpack}/overrides/local"; + "logs" = "${modpack}/overrides/logs"; + "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"; }; }; From c7531add8d4bf5730505aa131909816ae150652c Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 6 Apr 2026 14:41:39 +0300 Subject: [PATCH 7/7] Remove unnecessary symlinks for local and logs in Minecraft modpack overrides --- nix-system-configs/modules/system/minecraft.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index cfb0cdc..7062ac7 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -130,8 +130,6 @@ in { "fancymenu_data" = "${modpack}/overrides/fancymenu_data"; "journeymap" = "${modpack}/overrides/journeymap"; "kubejs" = "${modpack}/overrides/kubejs"; - "local" = "${modpack}/overrides/local"; - "logs" = "${modpack}/overrides/logs"; "manifest.json" = "${modpack}/overrides/manifest.json"; "minecraftinstance.json" = "${modpack}/overrides/minecraftinstance.json"; "observable_announce" = "${modpack}/overrides/observable_announce";