From 60e885b1a4a78b6ca4d97ec92e77e6147e1baddb Mon Sep 17 00:00:00 2001 From: Lucy von Overheidt Date: Sun, 14 Sep 2025 01:17:31 +0200 Subject: [PATCH] minecraft --- flake.lock | 96 ++++++++++++++++++++++++++++++++++++++++--- flake.nix | 3 ++ modules/minecraft.nix | 21 ++++++++++ 3 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 modules/minecraft.nix diff --git a/flake.lock b/flake.lock index a997867..b4b2c2a 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -61,6 +77,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -115,11 +149,31 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1757555667, + "narHash": "sha256-09403AZgH/TR1bpilDm8yJucZ2hYcZm8bzY3t8NgPJQ=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "d6d19d54dcec2a6afac3b9442643dd18e8b0566d", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nix-topology": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -153,6 +207,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1730531603, "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", @@ -168,7 +238,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1757487488, "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", @@ -186,7 +256,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nix-topology", @@ -215,8 +285,9 @@ "inputs": { "comin": "comin", "flux": "flux", + "nix-minecraft": "nix-minecraft", "nix-topology": "nix-topology", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "systems": { @@ -233,6 +304,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 496d09d..70dc2d9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ url = "github:nlewo/comin"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; outputs = @@ -23,9 +24,11 @@ ./modules/git.nix ./modules/comin.nix ./modules/podman.nix + ./modules/minecraft.nix inputs.comin.nixosModules.comin inputs.flux.nixosModules.default + inputs.nix-minecraft.nixosModules.minecraft-servers ]; }; }; diff --git a/modules/minecraft.nix b/modules/minecraft.nix new file mode 100644 index 0000000..2873c42 --- /dev/null +++ b/modules/minecraft.nix @@ -0,0 +1,21 @@ +{ + lib, + ... +}: + +{ + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "minecraft-server" + ]; + services.minecraft-servers = { + enable = true; + eula = true; + openFirewall = true; + servers.vanilla = { + enable = true; + jvmOpts = "-Xmx4G -Xms2G"; + }; + }; +}