From 3dc4432406274e6c1af52f5f89ac4d2283487d93 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 28 Jul 2024 10:53:42 +0100
Subject: [PATCH] Update minecraft sevver to 1.21

Fetch pinned version of nixpkgs-unstable to get newer papermcServer
versions

Remove bedrock.xenia.me.uk since it doesn't actually handle the port
redirection anyway...
---
 system/services/minecraft.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/system/services/minecraft.nix b/system/services/minecraft.nix
index 9c45608f..68a7d0a1 100644
--- a/system/services/minecraft.nix
+++ b/system/services/minecraft.nix
@@ -3,9 +3,20 @@
   pkgs,
   ...
 }: {
+  nixpkgs.overlays = [
+    # Fetch papermc v1.21 from unstable branch of nixpkgs
+    (final: prev: let
+      pinnedPkgs = import (builtins.fetchTarball {
+        url = "https://github.com/NixOS/nixpkgs/archive/03a94c776f261b78b95de0971a94dea0199b4cd8.tar.gz";
+        sha256 = "0vngf4g468qd5fqch85nzyvn7bpa6p2i6rdmzc6ws2653x868w3g";
+      }) {inherit (pkgs) system;};
+    in {
+      inherit (pinnedPkgs) papermc papermcServers;
+    })
+  ];
   services.minecraft-server = {
     enable = true;
-    package = pkgs.papermcServers.papermc-1_20_4;
+    package = pkgs.papermcServers.papermc-1_21;
     eula = true;
     openFirewall = true;
     declarative = true;
@@ -27,8 +38,5 @@
   };
 
   # Caddy forwarding
-  services.caddy.virtualHosts = {
-    "craft.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:${toString config.services.minecraft-server.serverProperties.server-port}";
-    "bedrock.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:19132";
-  };
+  services.caddy.virtualHosts."craft.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:${toString config.services.minecraft-server.serverProperties.server-port}";
 }