diff --git a/flake.lock b/flake.lock index 777d0bf..aefdd3e 100644 --- a/flake.lock +++ b/flake.lock @@ -104,40 +104,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "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": [ @@ -232,33 +198,13 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1748570485, - "narHash": "sha256-oDnEc/rxyDf+uUXO56Z2TJtrrQoBe0Z4MCIRaY6lVZ0=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "6c961ee42ff2301ee61c75aa42cbe8c8adecf3c8", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -284,22 +230,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -309,8 +239,7 @@ "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", "nix-flatpak": "nix-flatpak", - "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" } }, @@ -344,21 +273,6 @@ "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" - } - }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 464038b..b86c103 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,6 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; impermanence.url = "github:nix-community/impermanence"; @@ -46,7 +44,6 @@ disko, agenix, deploy-rs, - nix-minecraft, nix-flatpak, impermanence, ... @@ -125,14 +122,6 @@ hostname = "trantor"; type = "server"; system = "aarch64-linux"; - extraModules = [ - nix-minecraft.nixosModules.minecraft-servers - { - nixpkgs.overlays = [ - nix-minecraft.overlays.default - ]; - } - ]; }; }; diff --git a/hosts/modules/trantor/default.nix b/hosts/modules/trantor/default.nix index a357f9b..9bdb292 100644 --- a/hosts/modules/trantor/default.nix +++ b/hosts/modules/trantor/default.nix @@ -6,6 +6,5 @@ ./disko.nix ./hardware-configuration.nix ./networking.nix - ./minecraft.nix ]; } diff --git a/hosts/modules/trantor/minecraft.nix b/hosts/modules/trantor/minecraft.nix deleted file mode 100644 index 44b8532..0000000 --- a/hosts/modules/trantor/minecraft.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: - -{ - services.minecraft-server = { - enable = true; - eula = true; - servers.fabric = { - enable = true; - package = pkgs.fabricServers.fabric-1_21_5; - jvmOpts = "-Xms2G -Xmx8G"; - openFirewall = true; - serverProperties = { - server-port = 25566; - difficulty = "hard"; - gamemode = "survival"; - white-list = true; - motd = "Servidor dos primos"; - }; - }; - }; -}