root/the_prg_server_configuration
1
0
Fork 0
mirror of https://codeberg.org/polyteknisk-radiogruppe/the_prg_server_configuration.git synced 2026-10-21 03:15:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: root:c7531add8d4bf5730505aa131909816ae150652c
Branches Tags
root:main
..
compare: root:3d05307c93931cd912af0c1fc4f91c020c5066c0
Branches Tags
root:main

No commits in common. "c7531add8d4bf5730505aa131909816ae150652c" and "3d05307c93931cd912af0c1fc4f91c020c5066c0" have entirely different histories.
c7531add8d ... 3d05307c93

2 changed files with 7 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nix-system-configs/modules/scripts/pull.zsh
View file

@ -198,15 +198,6 @@ else
exit 1 exit 1
fi 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 # Step 4: Rebuild system using local flake
# Compute repository root (three levels up from this script: .../nix-system-configs/modules/scripts -> repo root) # Compute repository root (three levels up from this script: .../nix-system-configs/modules/scripts -> repo root)
FLAKE_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)" FLAKE_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"

33
nix-system-configs/modules/system/minecraft.nix
View file

@ -70,16 +70,17 @@ in {
eula = true; eula = true;
openFirewall = true; openFirewall = true;
servers.all-the-mods-ten-tss = { servers.all-the-mods-ten = {
enable = true; enable = true;
autoStart = true; autoStart = true;
restart = "always"; 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 " " [ jvmOpts = lib.concatStringsSep " " [
"-Xms18G" "-Xms28G"
"-Xmx45G" # Use 120GB of RA
"-Xmx32G"
]; ];
serverProperties = { serverProperties = {
@ -112,31 +113,11 @@ in {
symlinks = { symlinks = {
"mods" = "${modpack}/overrides/mods"; "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 = { files = {
"backup" = "${modpack}/overrides/backup";
"blueprints" = "${modpack}/overrides/blueprints";
"command_history.txt" = "${modpack}/overrides/command_history.txt";
"config" = "${modpack}/overrides/config"; "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"; "kubejs" = "${modpack}/overrides/kubejs";
"manifest.json" = "${modpack}/overrides/manifest.json"; "datapacks" = "${modpack}/overrides/datapacks";
"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";
}; };
}; };
@ -152,7 +133,7 @@ in {
jvmOpts = lib.concatStringsSep " " [ jvmOpts = lib.concatStringsSep " " [
"-Xms54G" "-Xms54G"
# Use 120GB of RA # Use 120GB of RA
"-Xmx70G" "-Xmx120G"
"-XX:+UseG1GC" "-XX:+UseG1GC"
"-XX:+ParallelRefProcEnabled" "-XX:+ParallelRefProcEnabled"