add minecraft server and move palworld to games module

6 files changed, 56 insertions, 3 deletions

diff --git a/flake.nix b/flake.nix
index d89eebe..6a32a64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,7 +50,7 @@
           nixosConfigurations = with self.nixosModules; {
             # vultr-image = mkSystem [ common users image vultr ];
 
-            ettves = mkSystem [ (import ./machines/ettves) kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant palworld games languagetool ];
+            ettves = mkSystem [ (import ./machines/ettves) kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant games languagetool ];
             phaenn = mkSystem [ (import ./machines/phaenn) zfs acme tlmp ];
             fra01 = mkSystem [ (import ./machines/fra01) vultr bgp powerdns acme garage ];
             nyc01 = mkSystem [ (import ./machines/nyc01) vultr bgp powerdns acme garage ];
diff --git a/modules/default.nix b/modules/default.nix
index 8bb0fe0..a288345 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -24,6 +24,5 @@
   garage = import ./garage;
   languagetool = import ./languagetool;
 
-  palworld = import ./palworld;
   games = import ./games;
 }
diff --git a/modules/games/default.nix b/modules/games/default.nix
index 4d701f9..65b750e 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [ ./palworld.nix ];
+
   services.factorio = {
     enable = true;
     package = pkgs.unstable.factorio-headless;
@@ -19,4 +21,28 @@
       hostname = "cocaine.farm xonotic $g_xonoticversion";
     };
   };
+
+  services.minecraft-server = {
+    enable = true;
+    package = pkgs.unstable.papermc;
+    eula = true;
+
+    declarative = true;
+    whitelist = import ./minecraft_whitelist.nix;
+    serverProperties = {
+      motd = "Fun for the whole family!";
+
+      server-ip = "178.63.224.11";
+      server-port = 25565;
+
+      enforce-secure-profile = false;
+      difficulty = "hard";
+      enable-rcon = true;
+      "rcon.password" = builtins.readFile ../../secrets/rcon;
+      force-gamemode = true;
+      white-list = true;
+      level-type = "default";
+      spawn-protection = 0;
+    };
+  };
 }
diff --git a/modules/games/minecraft_whitelist.nix b/modules/games/minecraft_whitelist.nix
new file mode 100644
index 0000000..3a45096
--- /dev/null
+++ b/modules/games/minecraft_whitelist.nix
@@ -0,0 +1,28 @@
+{
+  peps77 = "08b26563-8926-44f5-b4cc-862d39e48a69";
+  TS29100 = "1529e460-2b03-4771-b07b-75b6b79e754f";
+  Dhantom = "2922abf7-37c4-4df9-85af-95bdbb1a8982";
+  Adolfo = "2947f9ba-4f66-4d9b-9a4b-8161bb60e3bc";
+  ErzaChaan = "367205e9-ed0f-4232-b94c-a2853450b590";
+  chickenfliq = "3a17f96e-3999-4c6d-a983-afc0350074e5";
+  Do1Bi = "3fe7faaf-725e-4e4e-8952-65f439da3a88";
+  Maxiking164 = "6505b4ff-764a-4e4b-9522-ca590f229aeb";
+  Jumperjean = "6661efc1-2ef9-4e1e-9ea0-8175b15d35a5";
+  D0v4hkiinFM = "69bdd72f-7e4e-4c5c-a400-b525a3cd5b38";
+  alexdergamer400 = "711b58a3-abda-4a5b-9223-3063c741637a";
+  MissJessie189 = "767e2c99-9c79-41b3-89db-a38458f53b71";
+  xDignity = "777cce1d-5374-4d4d-a0e7-759802975b02";
+  Ruflee = "7c72f365-6c6a-41d7-a106-e8f724bf077d";
+  Madcon2007 = "90db34ae-38b6-4b78-a264-4dbbcafacf29";
+  Anymax2 = "940d3630-43c1-4ff5-b821-6d1941f5f64b";
+  Paschko = "977e24e2-d5db-45d1-a1ae-d2586df420c8";
+  YS4LY = "a038a99b-2f9f-4a74-9fff-76a968548701";
+  Saivatarr = "aa8c1582-3277-47f1-b314-b0385f688e61";
+  Audron = "af4f918f-f83b-417d-a563-90f35634e580";
+  Kuta9537 = "b09c6439-474b-46f8-9a37-3fabccbdc2ba";
+  Norepty = "b172c8f8-970c-4532-b26f-4e94d032a93f";
+  XDTOMXD2 = "b5b9bccc-3164-45d2-a216-9765c9eff451";
+  L_eo19 = "c3b38d25-7858-47b3-9568-575505cb2ff0";
+  "_maxohd_" = "c608eeea-563c-40a3-8bdb-706ebd576c14";
+  D3fus = "f01bb580-827d-4467-8949-5ae344d293cb";
+}
diff --git a/modules/palworld/default.nix b/modules/games/palworld.nix
index a3a8b6f..5ccc1fe 100644
--- a/modules/palworld/default.nix
+++ b/modules/games/palworld.nix
@@ -73,7 +73,7 @@
           MAX_PLAYERS = "32";
           SERVER_NAME = "cocaine.farm";
           SERVER_DESCRIPTION = "cocaine";
-          ADMIN_PASSWORD = "klausislove";
+          ADMIN_PASSWORD = builtins.readFile ../../secrets/rcon;
           SERVER_PASSWORD = "";
           PUBLIC_PORT = "8211";
           # PUBLIC_IP = ;
diff --git a/secrets b/secrets
-Subproject 98d1d7ebf3cf17e4282420f48846830df1a22b6
+Subproject dd0c201dbf65cf529036f64eceeb7887131d5f0