More server changes :3

This commit is contained in:
Jimbo 2024-12-27 18:47:07 -05:00
parent da6df2f98e
commit 2beaf963c2
12 changed files with 6 additions and 14 deletions

View file

@ -1,4 +1,4 @@
{ ... }: { lib, ... }:
{ {
options.system.mailserver = { options.system.mailserver = {
enable = lib.mkOption { enable = lib.mkOption {

View file

@ -6,8 +6,8 @@
./servers/dewdemolisher ./servers/dewdemolisher
./servers/johnside ./servers/johnside
./servers/roguecraft ./servers/roguecraft
#./servers/blockworld ./servers/blockworld
#./servers/uberbeta ./servers/uberbeta
]; ];
nixpkgs.overlays = [ minecraft.overlay ]; nixpkgs.overlays = [ minecraft.overlay ];

View file

@ -3,7 +3,6 @@ let
common = import ../../common { inherit pkgs; }; common = import ../../common { inherit pkgs; };
in { in {
services.minecraft-servers.servers.blockworld = { services.minecraft-servers.servers.blockworld = {
enable = true;
autoStart = false; autoStart = false;
package = pkgs.paperServers.paper-1_21_1; package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3072M"; jvmOpts = "-Xmx3072M";

View file

@ -3,7 +3,6 @@ let
common = import ../../common { inherit pkgs; }; common = import ../../common { inherit pkgs; };
in { in {
services.minecraft-servers.servers.dewdemolisher = { services.minecraft-servers.servers.dewdemolisher = {
enable = true;
package = pkgs.paperServers.paper-1_21_1; package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx2000M"; jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // { serverProperties = common.serverProperties // {

View file

@ -4,7 +4,6 @@ let
in { in {
services = { services = {
minecraft-servers.servers.johnside = { minecraft-servers.servers.johnside = {
enable = true;
package = pkgs.paperServers.paper-1_20_6; package = pkgs.paperServers.paper-1_20_6;
jvmOpts = "-Xmx2500M"; jvmOpts = "-Xmx2500M";
serverProperties = common.serverProperties // { serverProperties = common.serverProperties // {

View file

@ -4,7 +4,6 @@ let
in { in {
services = { services = {
minecraft-servers.servers.roguecraft = { minecraft-servers.servers.roguecraft = {
enable = true;
package = pkgs.paperServers.paper-1_21_1; package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3000M"; jvmOpts = "-Xmx3000M";
serverProperties = common.serverProperties // { serverProperties = common.serverProperties // {

View file

@ -11,7 +11,6 @@ let
}); });
in { in {
services.minecraft-servers.servers.uberbeta = { services.minecraft-servers.servers.uberbeta = {
enable = true;
package = uberBukkit; package = uberBukkit;
jvmOpts = "-Xmx512M"; jvmOpts = "-Xmx512M";
serverProperties = common.serverProperties // { serverProperties = common.serverProperties // {

View file

@ -3,7 +3,6 @@ let
common = import ../../common { inherit pkgs; }; common = import ../../common { inherit pkgs; };
in { in {
services.minecraft-servers.servers.velocity = { services.minecraft-servers.servers.velocity = {
enable = true;
package = pkgs.velocityServers.velocity; package = pkgs.velocityServers.velocity;
jvmOpts = "-Xmx512M"; jvmOpts = "-Xmx512M";
symlinks = { symlinks = {
@ -44,14 +43,12 @@ in {
allowedTCPPorts = [ allowedTCPPorts = [
25565 25565
19132 19132
30013
5657 5657
]; ];
# Server, VC, and Bedrock # Server, VC, and Bedrock
allowedUDPPorts = [ allowedUDPPorts = [
25565 25565
19132 19132
30013
]; ];
}; };
} }

View file

@ -1,6 +1,6 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./jimDomain1 ./jim1
]; ];
} }

View file

@ -3,7 +3,7 @@
imports = [ ./nginx ]; imports = [ ./nginx ];
services.lemmy = { services.lemmy = {
enable = true; enable = config.system.server.enable;
nginx.enable = true; nginx.enable = true;
database.createLocally = true; database.createLocally = true;
settings = { settings = {

View file

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
services.mastodon = { services.mastodon = {
enable = true; enable = config.system.server.enable;
localDomain = "social.${config.domains.jim1}"; localDomain = "social.${config.domains.jim1}";
streamingProcesses = 4; streamingProcesses = 4;
configureNginx = true; configureNginx = true;