diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index b4d9c2f..6889c6e 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -26,74 +26,53 @@ backend = "docker"; projects = { - minecraft_proxy.settings = { - services = { - mc_proxy = { - service = { - image = "ghcr.io/haveachin/infrared:1.3.3"; - environment = { - INFRARED_CONFIG_PATH = "/configs"; - }; - - volumes = [ "/etc/games/minecraft/proxy:/configs" ]; - ports = [ - "25565:25565/tcp" - ]; - - expose = [ - "25565" - ]; - }; - }; + minecraft_proxy.settings.services.mc_proxy.service = { + image = "ghcr.io/haveachin/infrared:1.3.3"; + environment = { + INFRARED_CONFIG_PATH = "/configs"; }; + + volumes = [ "/etc/games/minecraft/proxy:/configs" ]; + ports = [ + "25565:25565/tcp" + ]; + + expose = [ + "25565" + ]; }; - minecraft_compsoc_classic.settings = { - services = { - compsoc_classic = { - service = { - image = "nimmis/spigot:latest"; - # setting these here as they arent special - environment = { - # this is what it last ran on - SPIGOT_VER="1.18.2"; - EULA="true"; - }; - - # where the config files are stored - volumes = [ "/etc/games/minecraft/compsoc/test/config:/minecraft" ]; - - ports = [ - "20000:25565/tcp" - ]; - }; + minecraft_compsoc_classic.settings.services.compsoc_classic.service = { + image = "nimmis/spigot:latest"; + # setting these here as they arent special + environment = { + # this is what it last ran on + SPIGOT_VER="1.18.2"; + EULA="true"; }; - }; + # where the config files are stored + volumes = [ "/etc/games/minecraft/compsoc/test/config:/minecraft" ]; + + ports = [ + "20000:25565/tcp" + ]; }; - minecraft_compsoc_test.settings = { - services = { - compsoc_test = { - service = { - image = "nimmis/spigot:latest"; - environment = { - # this is what it last ran on - SPIGOT_VER="1.18.2"; - EULA="true"; - }; - - # where the config files are stored - volumes = [ "/etc/games/minecraft/compsoc/test2/config:/minecraft" ]; - - ports = [ - "20001:25565/tcp" - ]; - }; - - }; - + minecraft_compsoc_test.settings.services.compsoc_test.service = { + image = "nimmis/spigot:latest"; + environment = { + # this is what it last ran on + SPIGOT_VER="1.18.2"; + EULA="true"; }; + + # where the config files are stored + volumes = [ "/etc/games/minecraft/compsoc/test2/config:/minecraft" ]; + + ports = [ + "20001:25565/tcp" + ]; }; }; };