diff --git a/hosts/lucent-firepit/minecraft/default.nix b/hosts/lucent-firepit/minecraft/default.nix index cdfeea2..fecebee 100644 --- a/hosts/lucent-firepit/minecraft/default.nix +++ b/hosts/lucent-firepit/minecraft/default.nix @@ -55,7 +55,7 @@ in { "gayrats-creative" = import ./gayrats-creative.nix { inherit pkgs; - enable = true; + enable = false; server-port = 25575; inherit unsup; @@ -64,6 +64,18 @@ in { unsupINI = mkUnsupINI { url = "https://oat.zone/f/gayrats-creative/pack.toml"; }; }; + "gay-capybaras" = import ./gay-capybaras.nix { + inherit pkgs; + + enable = true; + server-port = 25505; + + inherit unsup; + inherit (gayrats) whitelist; + + unsupINI = mkUnsupINI { url = "https://aether.gay/f/gay-capybaras/pack.toml"; }; + }; + "n3ko-test" = import ./n3ko-test.nix { inherit pkgs; @@ -95,7 +107,7 @@ in { url = "https://raw.githack.com/ModFest/modfest-1-20/main/pack/pack.toml"; }; in { - enable = true; + enable = false; package = pkgs.fabricServers."fabric-1_20_4".override { loaderVersion = "0.15.3"; }; jvmOpts = ((import ./mc-flags.nix) "4G") + " -javaagent:${unsup}"; diff --git a/hosts/lucent-firepit/minecraft/gay-capybaras.nix b/hosts/lucent-firepit/minecraft/gay-capybaras.nix new file mode 100644 index 0000000..d30f313 --- /dev/null +++ b/hosts/lucent-firepit/minecraft/gay-capybaras.nix @@ -0,0 +1,29 @@ +{ pkgs, enable ? false, server-port, whitelist, unsup, unsupINI, ... }: + +{ + inherit enable; + autoStart = true; + openFirewall = true; + + inherit whitelist; + serverProperties = { + inherit server-port; + gamemode = 0; + motd = "dark-firepit, 1.20.1 Fabric"; + white-list = true; + max-players = 8; + allow-flight = true; + enable-command-block = true; + enforce-secure-profile = false; + snooper-enabled = false; + spawn-protection = 0; + }; + + symlinks = { "unsup.ini" = unsupINI; }; + + package = pkgs.fabricServers."fabric-1_20_1".override { loaderVersion = "0.15.6"; }; + # package = pkgs.fabricServers."fabric-1_20_1"; + + jvmOpts = "-Xmx6G -javaagent:${unsup}"; + +} diff --git a/hosts/lucent-firepit/minecraft/gayrats.nix b/hosts/lucent-firepit/minecraft/gayrats.nix index f9bf768..43f6236 100644 --- a/hosts/lucent-firepit/minecraft/gayrats.nix +++ b/hosts/lucent-firepit/minecraft/gayrats.nix @@ -21,6 +21,8 @@ symlinks = { "unsup.ini" = unsupINI; }; - package = pkgs.minecraftServers.fabric-1_19_2; + package = pkgs.fabricServers."fabric-1_19_2".override { loaderVersion = "0.14.17"; }; + jvmOpts = "-Xmx6G -javaagent:${unsup}"; -} \ No newline at end of file + +}