Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move around some minecraft stuff.

Browse source
This commit is contained in:
Jimbo 2024-09-25 03:44:06 -04:00
parent 6aad24d535
commit ce2b33f3ed
10 changed files with 52 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
system/desktop.nix
View file

@ -38,9 +38,6 @@
./services/udev.nix
./services/sunshine.nix
./services/mpd.nix
# School VPN
./services/globalprotect.nix
];
# Set hostname

2
system/desktop/school.nix
View file

@ -3,9 +3,9 @@
environment.systemPackages = with pkgs; [
remmina
freerdp
globalprotect-openconnect
python3
zoom-us
globalprotect-openconnect
];
# Enable Globalprotect VPN

2
system/desktop/wireguard.nix
View file

@ -12,7 +12,7 @@
{ # 0.0.0.0 makes wg act like a traditional VPN
publicKey = outputs.secrets.wgServerPub;
allowedIPs = [ "0.0.0.0/0" ];
endpoint = "mc.${outputs.secrets.jimDomain}:51820";
endpoint = "sv.${outputs.secrets.jimDomain}:51820";
persistentKeepalive = 25;
}
];

6
system/server/minecraft/common.nix
View file

@ -27,8 +27,8 @@
# Common plugins
paperSymlinks = {
"plugins/Backuper.jar" = builtins.fetchurl {
url = "https://cdn.modrinth.com/data/7cMAqMND/versions/nkcNIvUw/Backuper-3.0.1.jar";
sha256 = "081hvs7khd9s8598i59ai8n0idp85rgc89m9hpfajwym9rmy7il4";
url = "https://cdn.modrinth.com/data/7cMAqMND/versions/DqtME18V/Backuper-3.1.0.jar";
sha256 = "0lml9mz8ky2g9iy5xb61s15biwlbxfi5w4mfamxfin2kl4w6ggq9";
};
"plugins/BungeeGuard.jar" = builtins.fetchurl {
url = "https://github.com/lucko/BungeeGuard/releases/download/v1.3.3/BungeeGuard.jar";
@ -61,7 +61,7 @@
};
# Config files
configSymlinks = {
configFiles = {
"plugins/Essentials/config.yml" = ./essentialsconfig.yml;
"plugins/voicechat/voicechat-server.properties" = ./vcserver.properties;
};

2
system/server/minecraft/default.nix
View file

@ -6,7 +6,7 @@
./servers/johnside.nix
./servers/blockworld.nix
./servers/uberbeta.nix
#./servers/freaktards.nix
./servers/roguecraft.nix
];
nixpkgs.overlays = [ inputs.minecraft.overlay ];

5
system/server/minecraft/servers/blockworld.nix
View file

@ -9,9 +9,10 @@ in {
serverProperties = common.serverProperties // {
difficulty = 2;
server-port = 30012;
motd = "§fArchival §l§n§cBloxelcom §r§fMinecraft server.";
motd = "\\u00A7fArchival \\u00A7l\\u00A7n\\u00A7cBloxelcom \\u00A7r\\u00A7fMinecraft server.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks // common.configSymlinks;
symlinks = common.paperSymlinks;
files = common.configFiles;
};
}

7
system/server/minecraft/servers/dewdemolisher.nix
View file

@ -4,13 +4,14 @@ in {
services.minecraft-servers.servers.dewdemolisher = {
enable = true;
package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3072M";
jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // {
difficulty = 2;
server-port = 30010;
motd = "§l§aDew Demolisher is here.";
motd = "\\u00A7l\\u00A7aDew Demolisher is here.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks // common.configSymlinks;
symlinks = common.paperSymlinks;
files = common.configFiles;
};
}

7
system/server/minecraft/servers/johnside.nix
View file

@ -5,14 +5,14 @@ in {
minecraft-servers.servers.johnside = {
enable = true;
package = pkgs.paperServers.paper-1_20_6;
jvmOpts = "-Xmx3072M";
jvmOpts = "-Xmx2500M";
serverProperties = common.serverProperties // {
difficulty = 2;
server-port = 30009;
motd = "§l§9Johnside SMP§r §l§fworld for §4John lovers only.";
motd = "\\u00A7l\\u00A79Johnside SMP\\u00A7r \\u00A7l\\u00A7fworld for \\u00A74John lovers only.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks // common.configSymlinks // {
symlinks = common.paperSymlinks // {
"plugins/BlueMap.jar" = builtins.fetchurl {
url = "https://cdn.modrinth.com/data/swbUV1cr/versions/TL5ElRWX/BlueMap-5.3-spigot.jar";
sha256 = "08ls3wk0333vjg49kcmri884pcgm2xk9xdhwcxyffbh4ra0xrlbw";
@ -38,6 +38,7 @@ in {
sha256 = "0mbp73xclr7f5m2lbdfz6is1j8vvyv1qwpl28sm089zrpm73qn6w";
};
};
files = common.configFiles;
};
# BlueMap webhost

35
system/server/minecraft/servers/roguecraft.nix Normal file
View file

@ -0,0 +1,35 @@
{pkgs, outputs, ...}: let
common = import ../common.nix { inherit pkgs; };
in {
services = {
minecraft-servers.servers.roguecraft = {
enable = true;
package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3000M";
serverProperties = common.serverProperties // {
difficulty = 3;
server-port = 30014;
motd = "\\u00A7l\\u00A7bJimbo's \\u00A7cRoguecraft \\u00A7bserver.";
require-resource-pack = true;
resource-pack = "https://${outputs.secrets.jimDomain}/roguecraftresourcepackredir";
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles // {
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
url = "https://${outputs.secrets.jimDomain}/roguecraftdatapackredir";
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
};
};
};
nginx.virtualHosts."${outputs.secrets.jimDomain}".locations = {
"/roguecraftdatapackredir" = {
return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
};
"/roguecraftresourcepackredir" = {
return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/C6bITJnq/Roguecraft%201.2.5.4%20-%20Resource%20Pack.zip";
};
};
};
}

3
system/services/globalprotect.nix
View file

@ -1,3 +0,0 @@
{
services.globalprotect.enable = true;
}