From 00b2d0fd26289de7f43f2ed8646f4285b1890d8f Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sun, 24 Mar 2024 01:26:13 -0400
Subject: [PATCH] Add nix-minecraft overlay and module

---
 flake.lock         | 82 +++++++++++++++++++++++++++++++++++++++++++---
 flake.nix          |  6 ++++
 system/default.nix |  5 ++-
 3 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index e7a5a7f..915acd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,6 +1,22 @@
 {
   "nodes": {
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -20,6 +36,24 @@
       "inputs": {
         "systems": "systems_3"
       },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_4"
+      },
       "locked": {
         "lastModified": 1705309234,
         "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@@ -34,9 +68,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -257,10 +291,32 @@
         "type": "github"
       }
     },
-    "nix-wsl": {
+    "nix-minecraft": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711243338,
+        "narHash": "sha256-Vj39ZUwzw+kZF8Tgk/cu6ksWLdu8MXgh0lNNnUea4Fc=",
+        "owner": "infinidoge",
+        "repo": "nix-minecraft",
+        "rev": "25992bbf8fe0ec70b7afa2f26217f97fbb9c8bb4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "infinidoge",
+        "repo": "nix-minecraft",
+        "type": "github"
+      }
+    },
+    "nix-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -373,18 +429,19 @@
         "hyprland": "hyprland",
         "hyprwm-contrib": "hyprwm-contrib",
         "nix-index-database": "nix-index-database",
+        "nix-minecraft": "nix-minecraft",
         "nix-wsl": "nix-wsl",
         "nixfiles-assets": "nixfiles-assets",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "pkg-android-tools": "pkg-android-tools",
         "rust-overlay": "rust-overlay",
-        "systems": "systems_5"
+        "systems": "systems_6"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -478,6 +535,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index fa21f1b..3f7df27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,11 @@
     # android tools versions [ 34.0.0, 34.0.5 ) causes bootloops somehow and 34.0.5 isn't in nixpkgs yet
     pkg-android-tools.url = "github:NixOS/nixpkgs/55070e598e0e03d1d116c49b9eff322ef07c6ac6";
 
+    nix-minecraft = {
+      url = "github:infinidoge/nix-minecraft";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     # provides an up-to-date database for comma
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
@@ -82,6 +87,7 @@
       inputs.hyprwm-contrib.overlays.default
       inputs.rust-overlay.overlays.default
       inputs.nixfiles-assets.overlays.default
+      inputs.nix-minecraft.overlays.default
     ];
 
     ### Configuration
diff --git a/system/default.nix b/system/default.nix
index fdfe9e1..97d623e 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, options, nixpkgs, home-manager, ... }@args:
+{ pkgs, config, lib, options, nixpkgs, home-manager, inputs, ... }@args:
 let
   cfg = config.nixfiles;
   flakeType = cfg.lib.types.flake;
@@ -14,6 +14,9 @@ in
     ./testing
     ./cachix.nix
     ./mitigations.nix
+
+    # modules
+    inputs.nix-minecraft.nixosModules.minecraft-servers
   ];
   config = {};
   options.nixfiles = {