From fa6f9297af64affaa9e7a6889ac652515110e2de Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 14 Aug 2025 01:27:51 -0700 Subject: [PATCH] Revert "minecraft: lazymc" This reverts commit a081e6c6ee58f7012bcdc123d0dfe16b574a36bf. --- flake.lock | 11 +++++------ flake.nix | 3 +-- services/minecraft.nix | 8 +------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 7bd0e08..01858e2 100644 --- a/flake.lock +++ b/flake.lock @@ -260,17 +260,16 @@ ] }, "locked": { - "lastModified": 1754714638, - "narHash": "sha256-/9sKZOLN/rTAnDVV2KtKNSHXHpt4mvgqA879AvhQ9no=", - "owner": "Yeshey", + "lastModified": 1754964387, + "narHash": "sha256-r3mRiVL25AZXNe6ACCgIqWoeoFAa6YJDScdReu0DQ58=", + "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "95fb235bd93a136b7b3fde1329fa4bead50104a6", + "rev": "b2cb98ebb0629825c2b38f7a74533cd428bb7983", "type": "github" }, "original": { - "owner": "Yeshey", + "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "95fb235bd93a136b7b3fde1329fa4bead50104a6", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b0e2c1a..6b4496a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-minecraft = { - # url = "github:Infinidoge/nix-minecraft"; - url = "github:Yeshey/nix-minecraft/95fb235bd93a136b7b3fde1329fa4bead50104a6"; + url = "github:Infinidoge/nix-minecraft"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/services/minecraft.nix b/services/minecraft.nix index 2e53a1b..5ed59e8 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -43,7 +43,7 @@ "-Xmx${heap_size} -Xms${heap_size} -XX:+UseZGC -XX:+ZGenerational"; serverProperties = { - server-port = 25566; + server-port = 25565; enforce-whitelist = true; gamemode = "survival"; white-list = true; @@ -53,12 +53,6 @@ simulation-distance = 6; sync-chunk-writes = false; spawn-protection = 0; - max-tick-time = -1; # Recommended with lazymc - }; - - lazymc = { - enable = true; - config.public.address = "0.0.0.0:25565"; }; whitelist = import ../secrets/minecraft-whitelist.nix;