mirror of
https://codeberg.org/polyteknisk-radiogruppe/the_prg_server_configuration.git
synced 2026-10-21 03:15:46 +02:00
Compare commits
7 commits
3d05307c93
...
c7531add8d
| Author | SHA1 | Date | |
|---|---|---|---|
| c7531add8d | |||
| 77bac2bda3 | |||
| ab3177ddca | |||
| 91783bb8d9 | |||
| 5be9428e49 | |||
| 77019e53d3 | |||
| a6bc09caac |
2 changed files with 35 additions and 7 deletions
|
|
@ -198,6 +198,15 @@ 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)"
|
||||||
|
|
|
||||||
|
|
@ -70,17 +70,16 @@ in {
|
||||||
eula = true;
|
eula = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
|
||||||
servers.all-the-mods-ten = {
|
servers.all-the-mods-ten-tss = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
restart = "always";
|
restart = "always";
|
||||||
|
|
||||||
package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_220;
|
package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_224;
|
||||||
|
|
||||||
jvmOpts = lib.concatStringsSep " " [
|
jvmOpts = lib.concatStringsSep " " [
|
||||||
"-Xms28G"
|
"-Xms18G"
|
||||||
# Use 120GB of RA
|
"-Xmx45G"
|
||||||
"-Xmx32G"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
serverProperties = {
|
serverProperties = {
|
||||||
|
|
@ -113,11 +112,31 @@ 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";
|
||||||
"kubejs" = "${modpack}/overrides/kubejs";
|
|
||||||
"datapacks" = "${modpack}/overrides/datapacks";
|
"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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -133,7 +152,7 @@ in {
|
||||||
jvmOpts = lib.concatStringsSep " " [
|
jvmOpts = lib.concatStringsSep " " [
|
||||||
"-Xms54G"
|
"-Xms54G"
|
||||||
# Use 120GB of RA
|
# Use 120GB of RA
|
||||||
"-Xmx120G"
|
"-Xmx70G"
|
||||||
|
|
||||||
"-XX:+UseG1GC"
|
"-XX:+UseG1GC"
|
||||||
"-XX:+ParallelRefProcEnabled"
|
"-XX:+ParallelRefProcEnabled"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue