From b3db304dfb1b2163739fa006b7310038516f015b Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <hi@m7.rs>
Date: Thu, 5 Jan 2023 03:13:52 -0300
Subject: [PATCH] hosts/minecraft: back to papermc upstream

---
 flake.lock                                   |  4 ++--
 hosts/electra/services/minecraft/default.nix | 21 ++++++--------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index cc3ce26b..813616a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -233,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672897870,
+        "lastModified": 1672898703,
         "narHash": "sha256-UV4gQGUUbUSGy+CsZthEGpWuveFJpvY3CnvjPBVzg1E=",
         "owner": "misterio77",
         "repo": "nix-minecraft",
-        "rev": "d8119d85b731ae30ca31c2c3c7213fd3f6ac47d4",
+        "rev": "357437985626a62388493de3d72c4936c1ff5409",
         "type": "github"
       },
       "original": {
diff --git a/hosts/electra/services/minecraft/default.nix b/hosts/electra/services/minecraft/default.nix
index 288d4e44..195bcb08 100644
--- a/hosts/electra/services/minecraft/default.nix
+++ b/hosts/electra/services/minecraft/default.nix
@@ -1,16 +1,15 @@
 { inputs, pkgs, outputs, config, lib, ... }:
 let
   lib' = import ./lib.nix { inherit pkgs; };
-  velocityForwardingSecret = "PI5rWuj39WTA";
   papermc = lib'.mkMCServer rec {
     pname = "papermc";
-    # version = "1.19.3-367";
-    # url = "https://api.papermc.io/v2/projects/paper/versions/1.19.3/builds/367/downloads/paper-1.19.3-367.jar";
-    # sha256 = "sha256-8OhbQFoLsuJJK38a1PEAdwJIZUSEw3l6jTs/5w4EHko=";
-    version = "1.19.3-R0.1";
-    url = "https://files.m7.rs/paper-bundler-${version}-SNAPSHOT-reobf.jar";
-    sha256 = "sha256-6mInBOGwmsEegSZVC4VjvWM0/kGGS2yugl2dtaW9YQ8=";
+    version = "1.19.3-367";
+    url = "https://api.papermc.io/v2/projects/paper/versions/1.19.3/builds/367/downloads/paper-1.19.3-367.jar";
+    sha256 = "sha256-8OhbQFoLsuJJK38a1PEAdwJIZUSEw3l6jTs/5w4EHko=";
   };
+  # FIXME: Using sops secrets would be the way to go, but not all configs support a "file" secret
+  # Maybe some way to replace secret strings in nix-minecraft managed files?
+  velocityForwardingSecret = "PI5rWuj39WTA";
 in
 {
   imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
@@ -159,12 +158,4 @@ in
       };
     };
   };
-
-  sops.secrets = {
-    velocity-forwarding-secret = {
-      owner = "minecraft";
-      group = "minecraft";
-      sopsFile = ../../secrets.yaml;
-    };
-  };
 }