Updated minecraft server

This commit is contained in:
William 2024-04-15 09:34:38 -03:00
parent 00838d0ccb
commit 3d1fec0491
2 changed files with 17 additions and 40 deletions

36
flake.lock generated
View file

@ -217,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711588575, "lastModified": 1712970252,
"narHash": "sha256-9lTwKUcGbxnyQ1Ne2EahRWKZKIywOrcHjpNHPqYuphs=", "narHash": "sha256-3flJKxsxg+V0jHQ9SB4tdRCYgxKsgzF/g8ERhj9BN0E=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ead5e3e917e43ab000150784c00a479de5502d43", "rev": "017d276fa8bc6a73520564dd6b0bf2469363612d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,16 +268,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1624561540, "lastModified": 1711523803,
"narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -298,22 +298,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -323,7 +307,7 @@
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"yousable": "yousable" "yousable": "yousable"
} }

View file

@ -3,21 +3,12 @@
let let
modpack = (pkgs.fetchPackwizModpack { modpack = (pkgs.fetchPackwizModpack {
url = url =
"https://raw.githubusercontent.com/baduhai/FFS/06d253f0cd262b8d4a178d4db8e1a7188051e8d0/pack.toml"; "https://raw.githubusercontent.com/baduhai/FFS/000a28196d5ec5e90222d69cfadb97311bb6f2c3/pack.toml";
packHash = "sha256-UXjUqDLVUIIUoucHLz9qTqZ7wXOVriCuAcSmeevNz+Q="; packHash = "sha256-EHL/rCkqcRzVvvnDZsP2s7S30ZBsG9r9L4Tn1dzjzWM=";
}).addFiles { });
"mods/FabricProxy-lite.jar" = pkgs.fetchurl rec {
pname = "fabrictailor";
version = "2.1.2";
url =
"https://cdn.modrinth.com/data/g8w1NapE/versions/MNgY2xFj/${pname}-${version}.jar";
hash = "sha256-oYM29Mcon9GTTyLcim85CPiWCdyB48nweVA+0Xq3PIY=";
};
};
mcVersion = modpack.manifest.versions.minecraft; mcVersion = modpack.manifest.versions.minecraft;
fabricVersion = modpack.manifest.versions.fabric; fabricVersion = modpack.manifest.versions.fabric;
serverVersion = serverVersion = lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}";
lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}-${fabricVersion}";
in { in {
services.minecraft-servers = { services.minecraft-servers = {
@ -26,7 +17,9 @@ in {
dataDir = "/data/minecraft"; dataDir = "/data/minecraft";
servers."seridor" = { servers."seridor" = {
enable = true; enable = true;
package = pkgs.fabricServers.${serverVersion}; package = pkgs.fabricServers.${serverVersion}.override {
loaderVersion = fabricVersion;
};
openFirewall = true; openFirewall = true;
serverProperties = { serverProperties = {
difficulty = "hard"; difficulty = "hard";