diff --git a/flake.lock b/flake.lock index b209ef2..fb4c994 100644 --- a/flake.lock +++ b/flake.lock @@ -111,22 +111,6 @@ "type": "github" } }, - "flake-compat_2": { - "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -145,24 +129,6 @@ "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" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -563,26 +529,6 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1765937121, - "narHash": "sha256-maweGZo3MDkmLwkBsBpRLMa0sqrg98jTn62c3m4/H0o=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "d6b615e2c84e49174b4c2021ba4369a9af0fae62", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1736166416, @@ -656,22 +602,6 @@ } }, "nixpkgs_5": { - "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_6": { "locked": { "lastModified": 1765779637, "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", @@ -717,8 +647,7 @@ "home-manager": "home-manager", "hydractify-bot": "hydractify-bot", "hyprland": "hyprland", - "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "spicetify-nix": "spicetify-nix" } }, @@ -744,7 +673,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1765687197, @@ -805,21 +734,6 @@ "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" - } - }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index 4bfa4fd..40ea217 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,6 @@ hydractify-bot.url = "github:hydractify/hydractify-bot"; blink-cmp.url = "github:Saghen/blink.cmp"; - - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; outputs = diff --git a/hosts/wizdesk/services/nixos/default.nix b/hosts/wizdesk/services/nixos/default.nix index 2a6fd22..fcdcf83 100644 --- a/hosts/wizdesk/services/nixos/default.nix +++ b/hosts/wizdesk/services/nixos/default.nix @@ -6,7 +6,6 @@ ./caddy.nix ./forgejo.nix ./jellyfin.nix - ./minecraft.nix ./nix-serve.nix ./postgresql.nix ]; diff --git a/hosts/wizdesk/services/nixos/minecraft.nix b/hosts/wizdesk/services/nixos/minecraft.nix deleted file mode 100644 index d4b141e..0000000 --- a/hosts/wizdesk/services/nixos/minecraft.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ nix-minecraft, pkgs, ... }: - -{ - imports = [ nix-minecraft.nixosModules.minecraft-servers ]; - nixpkgs.overlays = [ nix-minecraft.overlay ]; - - services.minecraft-servers = { - enable = true; - eula = true; - openFirewall = true; - - servers.cobblemon = { - enable = true; - package = pkgs.fabricServers.fabric-1_21_1.override { loaderVersion = "0.18.0"; }; - - openFirewall = true; - autoStart = true; - - jvmOpts = "-Xms2048M -Xmx8192M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=4M -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50"; - - operators = { - WizardLink = { - uuid = "55a58451-8fe9-4dfe-8011-1509e948e7a6"; - level = 3; - }; - }; - - serverProperties = { - allow-flight = true; - max-players = 15; - motd = "Welcome to \\u00A7c\\u00A7lHydractify\\u00A7r's \\u00A7bCobblemon\\u00A7r server!"; - }; - }; - }; -}