Skip to content

Commit 74c5d09

Browse files
Auto-format Nix files
1 parent cabed61 commit 74c5d09

File tree

2 files changed

+32
-23
lines changed

2 files changed

+32
-23
lines changed

flake.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
88
};
99

10-
outputs = inputs@{ self, nixpkgs, ... }:
10+
outputs =
11+
inputs@{ self, nixpkgs, ... }:
1112
let
1213
system = "x86_64-linux";
1314
pkgs = nixpkgs.legacyPackages.${system};
14-
in {
15+
in
16+
{
1517
# The itx server hosting most of my homelab.
1618
nixosConfigurations.itxserver = nixpkgs.lib.nixosSystem {
1719
specialArgs = { inherit inputs; };

modules/other/minecraft-server.nix

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
# ███╗ ███╗██╗███╗ ██╗███████╗ ██████╗██████╗ █████╗ ███████╗████████╗
22
# ████╗ ████║██║████╗ ██║██╔════╝██╔════╝██╔══██╗██╔══██╗██╔════╝╚══██╔══╝
3-
# ██╔████╔██║██║██╔██╗ ██║█████╗ ██║ ██████╔╝███████║█████╗ ██║
4-
# ██║╚██╔╝██║██║██║╚██╗██║██╔══╝ ██║ ██╔══██╗██╔══██║██╔══╝ ██║
5-
# ██║ ╚═╝ ██║██║██║ ╚████║███████╗╚██████╗██║ ██║██║ ██║██║ ██║
6-
# ╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝╚══════╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝
3+
# ██╔████╔██║██║██╔██╗ ██║█████╗ ██║ ██████╔╝███████║█████╗ ██║
4+
# ██║╚██╔╝██║██║██║╚██╗██║██╔══╝ ██║ ██╔══██╗██╔══██║██╔══╝ ██║
5+
# ██║ ╚═╝ ██║██║██║ ╚████║███████╗╚██████╗██║ ██║██║ ██║██║ ██║
6+
# ╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝╚══════╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝
77
# ═════════════════════════════════════════════════════════════════════════
88
# A simple minecraft server module for hosting a local network server.
99

10-
{ pkgs, lib, config, ... }@args:
10+
{
11+
pkgs,
12+
lib,
13+
config,
14+
...
15+
}@args:
1116
let
1217
inherit (args) inputs;
1318
nmx = inputs.nix-minecraft;
1419

1520
serverPack = pkgs.fetchzip {
16-
url =
17-
"https://mediafilez.forgecdn.net/files/6974/725/Prominence%20II%20Hasturian%20Era-v3.9.0.zip";
21+
url = "https://mediafilez.forgecdn.net/files/6974/725/Prominence%20II%20Hasturian%20Era-v3.9.0.zip";
1822
sha256 = "sha256-qa6Ma1LC/BnGF9yCSMb0hit3Sgx4bcgt7UAUo9aTeKM=";
1923
stripRoot = false;
2024
};
21-
maybeCollect = dir:
22-
if builtins.pathExists "${serverPack}/${dir}" then
23-
nmx.lib.collectFilesAt serverPack dir
24-
else
25-
{ };
26-
in {
25+
maybeCollect =
26+
dir:
27+
if builtins.pathExists "${serverPack}/${dir}" then nmx.lib.collectFilesAt serverPack dir else { };
28+
in
29+
{
2730
imports = [ nmx.nixosModules.minecraft-servers ];
2831

2932
nixpkgs.overlays = [ nmx.overlay ];
3033

31-
nixpkgs.config.allowUnfreePredicate = pkg:
32-
builtins.elem (lib.getName pkg) [ "minecraft-server" ];
34+
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
3335

3436
services.minecraft-servers = {
3537
enable = true;
@@ -42,14 +44,19 @@ in {
4244
autoStart = true;
4345
package = pkgs.fabricServers.fabric-1_20_1;
4446

45-
jvmOpts =
46-
"-Xms8G -Xmx8G -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:+ParallelRefProcEnabled";
47+
jvmOpts = "-Xms8G -Xmx8G -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:+ParallelRefProcEnabled";
4748

48-
serverProperties = { motd = "Lukas' Epic Minecraft Server!"; };
49+
serverProperties = {
50+
motd = "Lukas' Epic Minecraft Server!";
51+
};
4952

50-
files = maybeCollect "mods" // maybeCollect "overrides/mods"
51-
// maybeCollect "config" // maybeCollect "defaultconfigs"
52-
// maybeCollect "kubejs" // maybeCollect "scripts"
53+
files =
54+
maybeCollect "mods"
55+
// maybeCollect "overrides/mods"
56+
// maybeCollect "config"
57+
// maybeCollect "defaultconfigs"
58+
// maybeCollect "kubejs"
59+
// maybeCollect "scripts"
5360
// maybeCollect "config/ftbquests"
5461
// maybeCollect "overrides/config" # some CF packs use overrides/
5562
// maybeCollect "overrides/defaultconfigs";

0 commit comments

Comments
 (0)