diff --git a/flake.lock b/flake.lock index c9034d2..d72616a 100644 --- a/flake.lock +++ b/flake.lock @@ -136,6 +136,22 @@ "type": "github" } }, + "flake-compat_3": { + "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-utils": { "locked": { "lastModified": 1659877975, @@ -184,6 +200,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -246,6 +280,26 @@ "type": "github" } }, + "nix-minecraft_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1767147099, + "narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "01f571579edd64433f97c4294137fbc366deef4b", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1754028485, @@ -326,6 +380,22 @@ } }, "nixpkgs_6": { + "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_7": { "locked": { "lastModified": 1767273430, "narHash": "sha256-kDpoFwQ8GLrPiS3KL+sAwreXrph2KhdXuJzo5+vSLoo=", @@ -339,7 +409,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1737062831, "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", @@ -353,7 +423,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1736549401, "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", @@ -371,14 +441,16 @@ }, "reclamation": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nix-minecraft": "nix-minecraft_2", + "nixpkgs": "nixpkgs_7", + "utils": "utils" }, "locked": { - "lastModified": 1767619106, - "narHash": "sha256-QNwk0Y0UK+jSlmEfUFQJvtl6H/l/g02U+sijEH6UaIo=", + "lastModified": 1767625020, + "narHash": "sha256-R65OzHmfULOf3h1IFpo7EAU6SHzvFFcGTJjg0nNmnhs=", "ref": "refs/heads/master", - "rev": "cc22f5ec0338b4850577f6371c819fd7ef184877", - "revCount": 6, + "rev": "599cdeb340060be919864d3dd735108b6fdb9176", + "revCount": 7, "type": "git", "url": "https://git.shobu.fr/sin_serhao/reclamation" }, @@ -403,7 +475,7 @@ }, "shoblog-front": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1752594581, @@ -465,9 +537,39 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "testing-grounds": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1755527993, @@ -498,6 +600,24 @@ "repo": "nixpkgs", "type": "github" } + }, + "utils": { + "inputs": { + "systems": "systems_4" + }, + "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" + } } }, "root": "root", diff --git a/hosts/thea/minecraft.nix b/hosts/thea/minecraft.nix index 7c563a1..8522f34 100644 --- a/hosts/thea/minecraft.nix +++ b/hosts/thea/minecraft.nix @@ -9,10 +9,7 @@ let url = "file:///${inputs.testing-grounds.modpack}/pack.toml"; packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU="; }; - reclamation = pkgs.fetchPackwizModpack { - url = "file:///${inputs.reclamation.modpack}/pack.toml"; - packHash = "sha256-IEGFlPqykpE4eBJdehwGMN3SdFRjue9JIZSwm9Lmp1I="; - }; + reclamation = inputs.reclamation.packages.${pkgs.stdenv.system}; in { imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ]; @@ -28,8 +25,7 @@ in package = pkgs.fabricServers.fabric; symlinks = { - "mods" = "${reclamation}/mods"; - "mods/orphans" = "${inputs.reclamation.orphan_mods}"; + "mods" = reclamation.mods; }; serverProperties = {