diff --git a/cavemen/nixrunserver.sh b/cavemen/nixrunserver.sh index 29a1c47..8e6dced 100755 --- a/cavemen/nixrunserver.sh +++ b/cavemen/nixrunserver.sh @@ -3,7 +3,9 @@ #! nix-shell -p javaPackages.compiler.openjdk17 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/nixos-25.11 -java -Xmx8192M -Xms6144M -jar minecraft_server.jar nogui +source /home/h3lp/mineserver/minecraft.env + +java -Xmx${MEMORY_MAX}M -Xms${MEMORY_MIN}M -jar minecraft_server.jar nogui read -rp "Pack and publish world? [y/N] " answer if [[ "$answer" =~ ^[Yy]$ ]]; then diff --git a/minecraft.env b/minecraft.env index b04447f..34947bf 100644 --- a/minecraft.env +++ b/minecraft.env @@ -1,2 +1,4 @@ SERVERPACK=https://20111511.xyz/serverpack.tar.xz WORLD=https://20111511.xyz/world.tar.xz +MEMORY_MAX=8192 +MEMORY_MIN=6144 diff --git a/root/etc/nixos/configuration.nix b/root/etc/nixos/configuration.nix index f5bc9a0..e210c09 100644 --- a/root/etc/nixos/configuration.nix +++ b/root/etc/nixos/configuration.nix @@ -195,6 +195,8 @@ # 5) Copy cavemen/* files over, overwriting existing cp -rf "$TMPDIR/autodeploy/cavemen/." "$MINESERVER/" chmod +x "$MINESERVER/nixrunserver.sh" + # Also copy minecraft.env for future reference + cp "$TMPDIR/autodeploy/minecraft.env" "$MINESERVER/minecraft.env" # Cleanup and mark setup as done rm -rf "$TMPDIR"