Bun/nixos-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardize Minecraft variable formatting

Browse source
This commit is contained in:
Bun 2025-03-27 09:24:38 -04:00
parent 9190e09c93
commit 9dbf18228b
12 changed files with 108 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/home/settings/nix/channels/default.nix
View file

@ -1,14 +1,14 @@
{ config, lib, pkgs, stable, unstable, ... }:
{
with pkgs; {
nix.registry.stable.flake = stable;
nix.registry.unstable.flake = unstable;
_module.args.pkgsStable = import stable {
inherit (pkgs.stdenv.hostPlatform) system;
inherit (stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
_module.args.pkgsUnstable = import unstable {
inherit (pkgs.stdenv.hostPlatform) system;
inherit (stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
}

8
modules/system/services/server/minecraft/common/default.nix
View file

@ -1,5 +1,10 @@
{ pkgs, ... }:
{ config, lib, ... }:
{
options.services.minecraft-servers.common = lib.mkOption {
type = lib.types.attrs;
};
config.services.minecraft-servers.common = {
# Common properties
serverProperties = {
enforce-secure-profile = false;
@ -63,4 +68,5 @@
"plugins/Essentials/config.yml" = ./essentialsconfig.yml;
"plugins/voicechat/voicechat-server.properties" = ./vcserver.properties;
};
};
}

3
modules/system/services/server/minecraft/default.nix
View file

@ -1,7 +1,8 @@
{ config, lib, minecraft, ... }:
{
imports = [
./servers/default.nix
./common
./servers
minecraft.nixosModules.minecraft-servers
];

12
modules/system/services/server/minecraft/servers/blockworld/default.nix
View file

@ -1,20 +1,18 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.blockworld = {
autoStart = false;
package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3072M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 2;
server-port = 30012;
motd = "\\u00A7fArchival \\u00A7l\\u00A7n\\u00A7cBloxelcom \\u00A7r\\u00A7fMinecraft server.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles;
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.blockworld.enable [ "bloxel.nixfox.ca" ];
};

12
modules/system/services/server/minecraft/servers/cornworld/default.nix
View file

@ -1,19 +1,17 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.cornworld = {
package = pkgs.paperServers.paper-1_21_4;
jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 3;
server-port = 30016;
motd = "\\u00a7e\\u00a7lFreecorn Sever";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles;
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.cornworld.enable [ "corn.nixfox.ca" ];
};

12
modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
View file

@ -1,19 +1,17 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.dewdemolisher = {
package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 2;
server-port = 30010;
motd = "\\u00A7l\\u00A7aDew Demolisher is here.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles;
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.dewdemolisher.enable [ "dew.nixfox.ca" ];
};

12
modules/system/services/server/minecraft/servers/johnside/default.nix
View file

@ -1,18 +1,16 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.johnside = {
package = pkgs.paperServers.paper-1_21_4;
jvmOpts = "-Xmx2500M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 2;
server-port = 30009;
motd = "\\u00A7l\\u00A79Johnside SMP\\u00A7r \\u00A7l\\u00A7fworld for \\u00A74John lovers only.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks // {
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks // {
"plugins/CustomDiscs.jar" = builtins.fetchurl {
url = "https://github.com/Navoei/CustomDiscs/releases/download/v3.0/custom-discs-3.0.jar";
sha256 = "0xv0zrkdmjx0d7l34nqag8j004pm9zqivc12d3zy9pdrkv7pz87d";
@ -26,7 +24,7 @@ in {
sha256 = "0mbp73xclr7f5m2lbdfz6is1j8vvyv1qwpl28sm089zrpm73qn6w";
};
};
files = common.configFiles;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.johnside.enable [ "john.nixfox.ca" ];
};

12
modules/system/services/server/minecraft/servers/marsh/default.nix
View file

@ -1,19 +1,17 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.marsh = {
package = pkgs.paperServers.paper-1_21_4;
jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 3;
server-port = 30017;
motd = "\\u00A7l\\u00A72Murky.";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles;
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.marsh.enable [ "marsh.nixfox.ca" ];
};

12
modules/system/services/server/minecraft/servers/roguecraft/default.nix
View file

@ -1,12 +1,10 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.roguecraft = {
package = pkgs.paperServers.paper-1_21_1;
jvmOpts = "-Xmx3000M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 3;
server-port = 30014;
motd = "\\u00A7l\\u00A7bNixFox \\u00A7cRoguecraft \\u00A7bserver.";
@ -14,9 +12,9 @@ in {
resource-pack = "https://nixfox.ca/roguecraftresourcepackredir";
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles // {
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles // {
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
url = "https://nixfox.ca/roguecraftdatapackredir";
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";

12
modules/system/services/server/minecraft/servers/skyblock/default.nix
View file

@ -1,19 +1,17 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
in {
{
services = {
minecraft-servers.servers.skyblock = {
package = pkgs.paperServers.paper-1_21_4;
jvmOpts = "-Xmx2000M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 3;
server-port = 30015;
motd = "\\u00A7l\\u00A7aBlocking in the sky";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles;
whitelist = config.services.minecraft-servers.common.whitelist;
symlinks = config.services.minecraft-servers.common.paperSymlinks;
files = config.services.minecraft-servers.common.configFiles;
};
cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.skyblock.enable [ "skyblock.nixfox.ca" ];
};

3
modules/system/services/server/minecraft/servers/uberbeta/default.nix
View file

@ -1,6 +1,5 @@
{ config, lib, pkgs, ... }:
let
common = import ../../common { inherit pkgs; };
uberBukkitZip = pkgs.fetchzip {
url = "https://github.com/Moresteck/Project-Poseidon-Uberbukkit/releases/download/2.0.0/uberbukkit-2.0.0-java17.zip";
sha256 = "m4hgcqXJ43SnBGn6qNBGeEcXFv5Q8f/VFYJmx3aJ9PE=";
@ -14,7 +13,7 @@ in {
minecraft-servers.servers.uberbeta = {
package = uberBukkit;
jvmOpts = "-Xmx512M";
serverProperties = common.serverProperties // {
serverProperties = config.services.minecraft-servers.common.serverProperties // {
difficulty = 3;
server-port = 30005;
};

6
modules/system/settings/nix/channels/default.nix
View file

@ -1,11 +1,11 @@
{ config, lib, pkgs, stable, unstable, ... }:
{
with pkgs; {
_module.args.pkgsStable = import stable {
inherit (pkgs.stdenv.hostPlatform) system;
inherit (stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
_module.args.pkgsUnstable = import unstable {
inherit (pkgs.stdenv.hostPlatform) system;
inherit (stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
}