From bbc1f4dce19fad2d531c4438ff60de7f11327dce Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Sun, 23 Mar 2025 12:27:31 -0400
Subject: [PATCH] Add Marshy Minecraft server

---
 hosts/midas/services/default.nix              |  1 +
 .../server/minecraft/servers/default.nix      |  1 +
 .../minecraft/servers/marsh/default.nix       | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 modules/system/services/server/minecraft/servers/marsh/default.nix

diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix
index 27d5c65d..f74bd544 100644
--- a/hosts/midas/services/default.nix
+++ b/hosts/midas/services/default.nix
@@ -19,6 +19,7 @@
       servers = {
         velocity.enable = true;
         johnside.enable = true;
+	marsh.enable = true;
         cornworld.enable = true;
         skyblock.enable = true;
       };
diff --git a/modules/system/services/server/minecraft/servers/default.nix b/modules/system/services/server/minecraft/servers/default.nix
index 0b908a1a..b7088614 100644
--- a/modules/system/services/server/minecraft/servers/default.nix
+++ b/modules/system/services/server/minecraft/servers/default.nix
@@ -5,6 +5,7 @@
     ./cornworld
     ./dewdemolisher
     ./johnside
+    ./marsh
     ./roguecraft
     ./skyblock
     ./uberbeta
diff --git a/modules/system/services/server/minecraft/servers/marsh/default.nix b/modules/system/services/server/minecraft/servers/marsh/default.nix
new file mode 100644
index 00000000..551f3bad
--- /dev/null
+++ b/modules/system/services/server/minecraft/servers/marsh/default.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+let
+  common = import ../../common { inherit pkgs; };
+in {
+  services = {
+    minecraft-servers.servers.marsh = {
+      package = pkgs.paperServers.paper-1_21_4;
+      jvmOpts = "-Xmx2000M";
+      serverProperties = common.serverProperties // {
+        difficulty = 3;
+        server-port = 30017;
+        motd = "\\u00A7l\\u00A72Murky.";
+      };
+      whitelist = common.whitelist;
+      symlinks = common.paperSymlinks;
+      files = common.configFiles;
+    };
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.marsh.enable [ "marsh.nixfox.ca" ];
+  };
+}