diff --git a/nix-system-configs/modules/scripts/pull.zsh b/nix-system-configs/modules/scripts/pull.zsh index 72f5051..42554bf 100755 --- a/nix-system-configs/modules/scripts/pull.zsh +++ b/nix-system-configs/modules/scripts/pull.zsh @@ -198,15 +198,6 @@ 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 7062ac7..16f7359 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -70,16 +70,17 @@ in { eula = true; openFirewall = true; - servers.all-the-mods-ten-tss = { + servers.all-the-mods-ten = { enable = true; autoStart = true; restart = "always"; - package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_224; + package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_220; jvmOpts = lib.concatStringsSep " " [ - "-Xms18G" - "-Xmx45G" + "-Xms28G" + # Use 120GB of RA + "-Xmx32G" ]; serverProperties = { @@ -112,31 +113,11 @@ 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"; + "datapacks" = "${modpack}/overrides/datapacks"; }; }; @@ -152,7 +133,7 @@ in { jvmOpts = lib.concatStringsSep " " [ "-Xms54G" # Use 120GB of RA - "-Xmx70G" + "-Xmx120G" "-XX:+UseG1GC" "-XX:+ParallelRefProcEnabled"