diff --git a/configuration.nix b/configuration.nix index 7fff131..a900511 100644 --- a/configuration.nix +++ b/configuration.nix @@ -124,11 +124,11 @@ allowedIPs = [ "10.100.0.13/32" ]; } { # meow - publicKey = "Jn3py2rxRuoluUl4eKxK+m+f21wMzQ4xI+NOMt7Oihc=" + publicKey = "Jn3py2rxRuoluUl4eKxK+m+f21wMzQ4xI+NOMt7Oihc="; allowedIPs = [ "10.100.0.14/32" ]; } { # fetti - publicKey = "g92YcBJQK/MOWMbpF8wZV/G8EgKdcIdltfdE/26GgSA=" + publicKey = "g92YcBJQK/MOWMbpF8wZV/G8EgKdcIdltfdE/26GgSA="; allowedIPs = [ "10.100.0.15/32" ]; } ]; @@ -155,7 +155,7 @@ # List services that you want to enable: - networking.firewall.allowedTCPPorts = [ 80 443 22 25565 25566 ]; + networking.firewall.allowedTCPPorts = [ 80 443 22 25565 25566 25567]; services.nginx = { enable = true; diff --git a/users/arion-compose.nix b/users/arion-compose.nix index 2f74995..d00cf1e 100644 --- a/users/arion-compose.nix +++ b/users/arion-compose.nix @@ -1,31 +1,46 @@ { pkgs, ... }: { project.name = "minecraft"; - services = { - mc = { - service.image = "itzg/minecraft-server:java17-jdk"; - service.volumes = [ "/home/podman/data:/data" ]; - service.dns = [ "8.8.8.8" ]; - service.network_mode = "host"; - service.environment = { - EULA = "true"; - TYPE = "FORGE"; - VERSION = "1.20.1"; - FORGE_VERSION = "47.2.20"; - MEMORY = "16G"; - }; + services = { + mc = { + service.image = "itzg/minecraft-server:java17-jdk"; + service.volumes = [ "/home/podman/data:/data" ]; + service.dns = [ "8.8.8.8" ]; + service.network_mode = "host"; + service.environment = { + EULA = "true"; + TYPE = "FORGE"; + VERSION = "1.20.1"; + FORGE_VERSION = "47.2.20"; + MEMORY = "16G"; }; - ftb_infinity = { - service.image = "itzg/minecraft-server:java8-multiarch"; - service.volumes = [ "/home/podman/ftb_infinity/data:/data" ]; - service.dns = [ "8.8.8.8" ]; - service.network_mode = "host"; - service.environment = { - EULA = "true"; - TYPE = "FORGE"; - VERSION = "1.7.10"; - FORGE_VERSION = "10.13.4.1614"; - MEMORY = "16G"; + }; + ftb_infinity = { + service.image = "itzg/minecraft-server:java8-multiarch"; + service.volumes = [ "/home/podman/ftb_infinity/data:/data" ]; + service.dns = [ "8.8.8.8" ]; + service.network_mode = "host"; + service.environment = { + EULA = "true"; + TYPE = "FORGE"; + VERSION = "1.7.10"; + FORGE_VERSION = "10.13.4.1614"; + MEMORY = "16G"; + }; + }; + fabric = { + service.image = "itzg/minecraft-server:java17-jdk"; + service.volumes = [ "/home/podman/fabric/data:/data" ]; + service.dns = [ "8.8.8.8" ]; + service.network_mode = "host"; + service.environment = { + EULA = "true"; + TYPE = "FABRIC"; + VERSION = "1.20.1"; + MEMORY = "16G"; + OPS = "Fallingsky04"; + SERVER_PORT = "25567"; + SEED="-2098004362385192995"; }; }; };