From d37899698cc6f7f61cdae2506ec94da216895e3b Mon Sep 17 00:00:00 2001
From: schweby <schweby@posteo.net>
Date: Sun, 6 Jun 2021 18:22:24 +0200
Subject: [PATCH] hainich: remove minecraft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nixos and its concepts/service management/update mechanism don't play nice with minecraft
In general some things I wanted to do (e.g. a map) are to spikiely resource intensive to run on a server meant to provide other services consistently
A replacement will be provided soon™
---
 hosts/hainich/configuration.nix      |  1 -
 hosts/hainich/services/minecraft.nix | 47 ----------------------------
 nix/sources.json                     |  8 -----
 pkgs/default.nix                     |  1 -
 4 files changed, 57 deletions(-)
 delete mode 100644 hosts/hainich/services/minecraft.nix

diff --git a/hosts/hainich/configuration.nix b/hosts/hainich/configuration.nix
index fec746a..27ad2c7 100644
--- a/hosts/hainich/configuration.nix
+++ b/hosts/hainich/configuration.nix
@@ -20,7 +20,6 @@
     ./services/syncthing.nix
     ./services/monitoring.nix
     ./services/workadventure.nix
-    ./services/minecraft.nix
     ./services/mattermost.nix
   ];
   boot.loader.grub.enable = true;
diff --git a/hosts/hainich/services/minecraft.nix b/hosts/hainich/services/minecraft.nix
deleted file mode 100644
index 3bd05ed..0000000
--- a/hosts/hainich/services/minecraft.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{pkgs, lib, config, ...}:
-
-let 
-      sources = import ../../../nix/sources.nix;
-in
-{
-  nixpkgs.config.allowUnfree = true;
-  networking.firewall.allowedTCPPorts = [ 25565 ];
-
-  services.minecraft-server = {
-    enable = true;
-    package = (pkgs.minecraft-server.overrideAttrs (old: rec {
-      version = "${sources.papermc.rev}-${sources.papermc.version}";
-      name = "papermc-${version}";
-      src = sources.papermc.outPath;
-      }));
-    declarative = true;
-    eula = true;
-    jvmOpts = "-Xmx1536M -Xms512M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
-
-    serverProperties = {
-      server-port = "25565";
-      gamemode = "survival";
-      motd = "NixCraft4future";
-      max-players = "20";
-      whitelist = true;
-      force-gamemode = true;
-      difficulty = "easy";
-      allow-flight= false;
-      pvp = false;
-      enable-rcon = false;
-    };
-
-    whitelist = {
-      AaronPirt = "bbb8a319-a0fe-4b7a-bdcc-d7941a7fcfa8";
-      ACY2003 = "e6caedfb-95de-44b6-bea7-962e765f2b74";
-      Hexchen = "137ad280-856c-4f27-b258-b263d4e6863b";
-      laXDer = "98043845-8bac-4d38-a479-d116eea90356";
-      Naigh = "96dd9a77-2a65-415b-8d48-1f00e146dc42";
-      Schweby = "a5680c67-1a85-4a9b-81b6-a3a0b7b52467";
-      wolkenzebratopf = "34f47e5b-3f81-4639-ab6b-97be5e358054";
-      yan_min = "a2d1b6f2-1b58-4433-be67-f9872c4332f1";
-      Zauberberg = "4c59c4c3-f16b-4b7e-b707-9a176958e7cf";
-    };
-
-  };
-}
diff --git a/nix/sources.json b/nix/sources.json
index f4dfc20..c7b956b 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -94,14 +94,6 @@
         "url": "https://github.com/nixos/nixpkgs/archive/1c2986bbb806c57f9470bf3231d8da7250ab9091.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "papermc": {
-        "rev": "1.16.5",
-        "sha256": "0w8vwl11adis6c69j8hpdq8vvmwxv5vj4h16cffhlp510brb0z8i",
-        "type": "file",
-        "url": "https://papermc.io/api/v2/projects/paper/versions/1.16.5/builds/734/downloads/paper-1.16.5-734.jar",
-        "url_template": "https://papermc.io/api/v2/projects/paper/versions/<rev>/builds/<version>/downloads/paper-<rev>-<version>.jar",
-        "version": "734"
-    },
     "pbb-nixfiles": {
         "branch": "main",
         "repo": "https://git.petabyte.dev/petabyteboy/nixfiles.git",
diff --git a/pkgs/default.nix b/pkgs/default.nix
index cca5db2..f5b27d7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -41,7 +41,6 @@ let
     });
 
     mattermost = callPackage ./mattermost {};
-    jre_headless = pkgs.jdk11_headless;
     inherit (unstable) bottom;
   };