From 7080b8f164677e555df7284dac7df85a2406043e Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Fri, 10 May 2024 22:45:13 -0400
Subject: [PATCH] Infini-SERVER: move minecraft servers to Infini-DL360

---
 hosts/Infini-DL360/default.nix  | 22 +++++++++++++++++++++-
 hosts/Infini-SERVER/default.nix | 15 ---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/hosts/Infini-DL360/default.nix b/hosts/Infini-DL360/default.nix
index a54f5ee..6d3bff0 100644
--- a/hosts/Infini-DL360/default.nix
+++ b/hosts/Infini-DL360/default.nix
@@ -1,10 +1,11 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, private, ... }: {
   imports = [
     ./hardware-configuration.nix
     ./disks.nix
 
     ./web.nix
 
+    private.nixosModules.minecraft-servers
     ./factorio.nix
     ./forgejo.nix
     ./freshrss.nix
@@ -73,4 +74,23 @@
     globalRedirect = "inx.moe";
     redirectCode = 302;
   };
+
+  services.minecraft-servers.servers.emd-server.autoStart = lib.mkForce false;
+
+  services.borgbackup.jobs."persist" = let tmux = lib.getExe pkgs.tmux; in {
+    preHook = ''
+      ${tmux} -S /run/minecraft/friend-server.sock send-keys "say Server is backing up..." Enter
+      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-off Enter
+      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-all Enter
+      ${tmux} -S /run/minecraft/sister-server.sock send-keys "say Server is backing up..." Enter
+      ${tmux} -S /run/minecraft/sister-server.sock send-keys save-off Enter
+      ${tmux} -S /run/minecraft/sister-server.sock send-keys save-all Enter
+    '';
+    postHook = ''
+      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-on Enter
+      ${tmux} -S /run/minecraft/friend-server.sock send-keys "say Backup complete" Enter
+      ${tmux} -S /run/minecraft/sister-server.sock send-keys save-on Enter
+      ${tmux} -S /run/minecraft/sister-server.sock send-keys "say Backup complete" Enter
+    '';
+  };
 }
diff --git a/hosts/Infini-SERVER/default.nix b/hosts/Infini-SERVER/default.nix
index 8519dc0..f45a0bb 100644
--- a/hosts/Infini-SERVER/default.nix
+++ b/hosts/Infini-SERVER/default.nix
@@ -1,6 +1,5 @@
 { config, pkgs, lib, private, ... }: {
   imports = [
-    private.nixosModules.minecraft-servers
     ./hardware-configuration.nix
     ./filesystems.nix
   ];
@@ -37,20 +36,6 @@
     soft-serve-ng.enable = true;
   };
 
-  services.minecraft-servers.servers.emd-server.autoStart = false;
-
-  services.borgbackup.jobs."persist" = let tmux = lib.getExe pkgs.tmux; in {
-    preHook = ''
-      ${tmux} -S /run/minecraft/friend-server.sock send-keys "say Server is backing up..." Enter
-      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-off Enter
-      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-all Enter
-    '';
-    postHook = ''
-      ${tmux} -S /run/minecraft/friend-server.sock send-keys save-on Enter
-      ${tmux} -S /run/minecraft/friend-server.sock send-keys "say Backup complete" Enter
-    '';
-  };
-
   persist = {
     directories = [
       "/srv"