diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index 60bd713..43d6a02 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -11,30 +11,31 @@ let arcanum-institute = "arcanum.alicehuston.xyz"; meits = "meits.alicehuston.xyz"; # bcg-plus = "bcg.alicehuston.xyz"; + pii = "pii.alicehuston.xyz"; }; defaultServer = "rlcraft"; - # defaultEnv = { - # EULA = "true"; - # TYPE = "AUTO_CURSEFORGE"; - # STOP_SERVER_ANNOUNCE_DELAY = "120"; - # STOP_DURATION = "600"; - # SYNC_CHUNK_WRITES = "false"; - # USE_AIKAR_FLAGS = "true"; - # MEMORY = "8GB"; - # ALLOW_FLIGHT = "true"; - # MAX_TICK_TIME = "-1"; - # }; + defaultEnv = { + EULA = "true"; + TYPE = "AUTO_CURSEFORGE"; + STOP_SERVER_ANNOUNCE_DELAY = "120"; + STOP_DURATION = "600"; + SYNC_CHUNK_WRITES = "false"; + USE_AIKAR_FLAGS = "true"; + MEMORY = "8GB"; + ALLOW_FLIGHT = "true"; + MAX_TICK_TIME = "-1"; + }; - # defaultOptions = [ - # "--stop-signal=SIGTERM" - # "--stop-timeout=1800" - # "--network=minecraft-net" - # ]; + defaultOptions = [ + "--stop-signal=SIGTERM" + "--stop-timeout=1800" + "--network=minecraft-net" + ]; - # vars = import ../vars.nix; - # minecraft_path = "${vars.primary_games}/minecraft"; + vars = import ../vars.nix; + minecraft_path = "${vars.primary_games}/minecraft"; in { virtualisation.oci-containers.containers = { @@ -52,23 +53,43 @@ in ) ]; }; - # rlcraft = { - # image = "itzg/minecraft-server:java8"; - # volumes = [ - # "${minecraft_path}/rlcraft/modpacks:/modpacks:ro" - # "${minecraft_path}/rlcraft/data:/data" - # ]; - # hostname = "rlcraft"; - # environment = defaultEnv // { - # VERSION = "1.12.2"; - # CF_SLUG = "rlcraft"; - # DIFFICULTY = "hard"; - # ENABLE_COMMAND_BLOCK = "true"; - # }; - # extraOptions = defaultOptions; - # log-driver = "local"; - # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; - # }; + #rlcraft = { + # image = "itzg/minecraft-server:java8"; + # volumes = [ + # "${minecraft_path}/rlcraft/modpacks:/modpacks:ro" + # "${minecraft_path}/rlcraft/data:/data" + # ]; + # hostname = "rlcraft"; + # environment = defaultEnv // { + # VERSION = "1.12.2"; + # CF_SLUG = "rlcraft"; + # DIFFICULTY = "hard"; + # ENABLE_COMMAND_BLOCK = "true"; + # }; + # extraOptions = defaultOptions; + # log-driver = "local"; + # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + #}; + prominence-ii = { + image = "itzg/minecraft-server:java25-graalvm"; + volumes = [ + "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro" + "${minecraft_path}/prominence-ii/data:/data" + ]; + hostname = "pii"; + environment = defaultEnv // { + VERSION = "1.20.1"; + TYPE = "modrinth"; + MODRINTH_MODPACK = "prominence-2-fabric"; + MODRINTH_VERSION = "3.9.14hf"; + USE_AIKAR_FLAGS = "false"; + USE_MEOWICE_FLAGS = "true"; + DIFFICULTY = "hard"; + ENABLE_COMMAND_BLOCK = "true"; + }; + extraOptions = defaultOptions; + log-driver = "local"; + }; # bcg-plus = { # image = "itzg/minecraft-server:java17"; # volumes = [