Merge pull request 'feature/pii' (#178) from feature/pii into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 9s
Check Nix flake / Perform Nix flake checks (push) Successful in 3m33s
Update flakes / update_lockfile (push) Successful in 9m52s

Reviewed-on: #178
This commit was merged in pull request #178.
This commit is contained in:
2026-01-19 21:14:06 -05:00

View File

@@ -79,54 +79,53 @@ in
# log-driver = "local"; # log-driver = "local";
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; # environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
#}; #};
#prominence-ii = { prominence-ii = {
# image = "itzg/minecraft-server:java25-graalvm"; image = "itzg/minecraft-server:java25-graalvm";
# volumes = [ volumes = [
# "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro" "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
# "${minecraft_path}/prominence-ii/data:/data" "${minecraft_path}/prominence-ii/data:/data"
# ]; ];
# hostname = "pii"; hostname = "pii";
# environment = defaultEnv // { environment = defaultEnv // {
# VERSION = "1.20.1"; VERSION = "1.20.1";
# CF_SLUG = "prominence-2-hasturian-era"; CF_SLUG = "prominence-2-hasturian-era";
# CF_FILENAME_MATCHER = "3.9.14hf"; CF_FILENAME_MATCHER = "3.9.14hf";
# USE_AIKAR_FLAGS = "false"; MEMORY = "8G";
# USE_MEOWICE_FLAGS = "true"; USE_AIKAR_FLAGS = "false";
# USE_MEOWICE_GRAALVM_FLAGS = "true"; USE_MEOWICE_FLAGS = "true";
# DIFFICULTY = "hard"; USE_MEOWICE_GRAALVM_FLAGS = "true";
# ENABLE_COMMAND_BLOCK = "true"; DIFFICULTY = "hard";
# CF_FORCE_INCLUDE_FILES = '' ENABLE_COMMAND_BLOCK = "true";
# emi CF_FORCE_INCLUDE_FILES = ''
# ''; emi
# }; '';
# extraOptions = defaultOptions; };
# log-driver = "local"; extraOptions = defaultOptions;
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; log-driver = "local";
#}; environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
#stoneblock-4 = { };
# image = "itzg/minecraft-server:java25-graalvm"; stoneblock-4 = {
# volumes = [ image = "itzg/minecraft-server:java25-graalvm";
# "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro" volumes = [
# "${minecraft_path}/stoneblock-4/data:/data" "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
# ]; "${minecraft_path}/stoneblock-4/data:/data"
# hostname = "stoneblock-4"; ];
# environment = defaultEnv // { hostname = "stoneblock-4";
# VERSION = "1.21.1"; environment = defaultEnv // {
# CF_SLUG = "prominence-2-hasturian-era"; VERSION = "1.21.1";
# CF_FILENAME_MATCHER = "3.9.14hf"; CF_SLUG = "ftb-stoneblock-4";
# USE_AIKAR_FLAGS = "false"; CF_FILENAME_MATCHER = "1.6.0";
# USE_MEOWICE_FLAGS = "true"; MEMORY = "8G";
# USE_MEOWICE_GRAALVM_FLAGS = "true"; USE_AIKAR_FLAGS = "false";
# DIFFICULTY = "hard"; USE_MEOWICE_FLAGS = "true";
# ENABLE_COMMAND_BLOCK = "true"; USE_MEOWICE_GRAALVM_FLAGS = "true";
# CF_FORCE_INCLUDE_FILES = '' DIFFICULTY = "hard";
# emi ENABLE_COMMAND_BLOCK = "true";
# ''; };
# }; extraOptions = defaultOptions;
# extraOptions = defaultOptions; log-driver = "local";
# log-driver = "local"; environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; };
#};
submerged-2 = { submerged-2 = {
image = "itzg/minecraft-server:java25-graalvm"; image = "itzg/minecraft-server:java25-graalvm";
volumes = [ volumes = [