From 95e5895cae008f800d1c33dbec868192b44ad034 Mon Sep 17 00:00:00 2001
From: Jimbo <jimjam4real@gmail.com>
Date: Tue, 27 Aug 2024 16:54:58 -0400
Subject: [PATCH] Initiate migration to Nix-Minecraft

---
 flake.lock             | 96 +++++++++++++++++++++++++++++++++++++++---
 flake.nix              |  1 +
 nixos/modules/base.nix |  2 +
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8666dc7..683236b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,6 +66,22 @@
       }
     },
     "flake-compat_2": {
+      "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_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -81,6 +97,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "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"
+      }
+    },
     "hardware": {
       "locked": {
         "lastModified": 1724067415,
@@ -139,11 +173,31 @@
         "type": "gitlab"
       }
     },
+    "nix-minecraft": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1724722703,
+        "narHash": "sha256-5xhQLp0tLY/1nWlcU5uYsCUawxcwqEzAGi0b8wAQKxA=",
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "rev": "f74de364f4354e509cc12399de4d4df834a0a45f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "type": "github"
+      }
+    },
     "nixos-mailserver": {
       "inputs": {
         "blobs": "blobs_2",
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_3",
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-24_05": "nixpkgs-24_05_2",
         "utils": "utils"
       },
@@ -238,6 +292,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1715266358,
+        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1717602782,
         "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@@ -252,7 +322,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1724242322,
         "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
@@ -289,8 +359,9 @@
         "hardware": "hardware",
         "home-manager": "home-manager",
         "mail": "mail",
+        "nix-minecraft": "nix-minecraft",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
@@ -310,9 +381,24 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "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"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1709126324,
diff --git a/flake.nix b/flake.nix
index 2ecc9c9..9d6ca33 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
     mail.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
     nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
+    nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
     # NixOS utils
     hardware.url = "github:nixos/nixos-hardware/master";
diff --git a/nixos/modules/base.nix b/nixos/modules/base.nix
index ae18e1a..31ebc84 100644
--- a/nixos/modules/base.nix
+++ b/nixos/modules/base.nix
@@ -12,6 +12,7 @@
   imports = [
     ./networking.nix
     ./gpg.nix
+    inputs.nix-minecraft.nixosModules.minecraft-servers
   ];
 
   nixpkgs = {
@@ -21,6 +22,7 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
+      inputs.nix-minecraft.overlay
     ];
 
     # Configure your nixpkgs instance