diff --git a/nixos/tako/services/default.nix b/nixos/tako/services/default.nix index c0dfa92..95d44e0 100644 --- a/nixos/tako/services/default.nix +++ b/nixos/tako/services/default.nix @@ -20,7 +20,7 @@ ./excalidraw.nix ./flatpak.nix ./flaresolverr.nix - # ./games + ./games # ./headscale.nix ./immich.nix ./kellnr.nix diff --git a/nixos/tako/services/games/default.nix b/nixos/tako/services/games/default.nix index bf6e97d..6219653 100644 --- a/nixos/tako/services/games/default.nix +++ b/nixos/tako/services/games/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { imports = [ - # ./minecraft.nix + ./minecraft.nix # ./satisfactory.nix # ./terraria.nix ]; diff --git a/nixos/tako/services/games/minecraft.nix b/nixos/tako/services/games/minecraft.nix index de661c6..a1ebcb3 100644 --- a/nixos/tako/services/games/minecraft.nix +++ b/nixos/tako/services/games/minecraft.nix @@ -6,7 +6,7 @@ }: { # imports = [inputs.nix-minecraft.nixosModules.minecraft-servers]; - networking.domains.subDomains."mc.darksailor.dev" = device.externalIp; + networking.domains.subDomains."mc.darksailor.dev".a.data = device.externalIp; services = let whitelist = { "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e"; @@ -54,17 +54,22 @@ # white-list = true; # }; # }; - neoforgeServers."fantasy" = { + servers."fantasy" = { inherit whitelist; enable = true; jvmOpts = "-Xmx16G -Xms16G"; + # nix-minecraft's fabric servers don't pass jre_headless to mkTextileServer, + # so they default to JDK 21; MC 26.1.2 needs JDK 25. + package = pkgs.fabricServers.fabric-26_1_2.override { + jre_headless = pkgs.jdk25_headless; + }; serverProperties = { - motd = "Servius's NeoForge Minecraft Server"; - server-port = 25567; + motd = "Servius's Fabric Minecraft Server"; + server-port = 25565; + level-name = "ForeverHere"; view-distance = 24; white-list = true; }; - gameversion = "1.20.1"; }; }; };