From 4c49824e41a1b02e5028ed1370a4d4c17093b744 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Mon, 4 Dec 2023 00:10:45 +0100
Subject: [PATCH] Add custom motd

---
 flake.lock                              |  6 +++---
 nixos-configurations/server/default.nix | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0608526..412cf9b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695497123,
-        "narHash": "sha256-i9pQ86ZFgLBVukuR76Nz5LyoVe2j4xOzjhv9B4B/3Ew=",
+        "lastModified": 1701549107,
+        "narHash": "sha256-5BHE+lsX3KdjRzXoOj6hadZktZSolFSFHvd2Nh1+/o0=",
         "owner": "thiloho",
         "repo": "discord-bot",
-        "rev": "f4f6e5c9180fff6cd41715cd6c2192f4228ea91d",
+        "rev": "aa78e420757075cc1a8c3d2241d81913dadb0b5a",
         "type": "github"
       },
       "original": {
diff --git a/nixos-configurations/server/default.nix b/nixos-configurations/server/default.nix
index 18974b2..d2ae0a1 100644
--- a/nixos-configurations/server/default.nix
+++ b/nixos-configurations/server/default.nix
@@ -40,19 +40,25 @@
         thilo = {
           enable = true;
           autoStart = true;
-          package = pkgs.paperServers.paper;
+          package = pkgs.paperServers.paper-1_20_1;
+          enableReload = true;
           openFirewall = true;
           whitelist = {
             thilo_ho = "4e4d744d-7748-46bc-add8-b3e8ca3b4cf5";
             PegasusIsHere = "24155f74-eb04-4f45-a743-f2b7eb71c6a2";
             BakaZaps = "1888532c-6df7-4514-b96a-99ed4e7684f2";
             Liaxswan = "ccbf3468-a6b4-4d7b-9837-5a2451deca79";
+            rayboo120 = "c65f9422-b972-4583-82b5-2e5a12e789fd";
+            AmValo = "a5f4a7d9-daf2-4ec9-b1c9-e39efdfb331e";
+            TubiCFW = "fbbd217b-cf9f-404a-a0b4-671155d43222";
+            TheRacccooon = "f3a639f2-b82c-49c2-80e5-ccd5cbdc9541";
+            _Zyronx = "865f911f-66ae-479f-a65a-8140da82b96e";
           };
           serverProperties = {
             difficulty = 3;
             max-players = 20;
             motd = "§aThilo's survival server";
-            white-list = true;
+            white-list = false;
           };
           files = {
             "ops.json".value = [
@@ -117,6 +123,7 @@
             "plugins/LuckPerms/config.yml".value = {
               storage-method = "yaml";
             };
+            /*
             "plugins/LuckPerms/yaml-storage/users/4e4d744d-7748-46bc-add8-b3e8ca3b4cf5.yml".value = {
               uuid = "4e4d744d-7748-46bc-add8-b3e8ca3b4cf5";
               name = "thilo_ho";
@@ -125,6 +132,7 @@
                 "admin"
               ];
             };
+            */
             "plugins/LuckPerms/yaml-storage/groups/admin.yml".value = {
               name = "admin";
               permissions = [
@@ -270,6 +278,15 @@
                 };
               };
             };
+            "plugins/Essentials/motd.txt" = pkgs.writeText "motd.txt" ''
+              &m                                                                  
+              &6Welcome, {PLAYER}&6!
+              &6Type &c/help&6 for a list of commands.
+              &6Type &c/list&6 to see who else is online.
+              &6Players online:&c {ONLINE} &6- World time:&c {WORLDTIME12}
+              &6Discord server: &chttps://discord.gg/SX7fXrDtth
+              &m                                                                  
+            '';
           };
           symlinks = {
             "server-icon.png" = pkgs.fetchurl {