From 0b5f3b84e593acdfdb7d022c2f4f10ef99da229f Mon Sep 17 00:00:00 2001 From: Jimbo Date: Mon, 23 Sep 2024 11:44:18 -0400 Subject: [PATCH 1/2] Small reference change --- system/base.nix | 1 - system/server/minecraft/default.nix | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/base.nix b/system/base.nix index bf85d16e..441f1e35 100644 --- a/system/base.nix +++ b/system/base.nix @@ -13,7 +13,6 @@ outputs.overlays.selfsuper outputs.overlays.finalprev outputs.overlays.unstable-packages - inputs.minecraft.overlay ]; # Configure your nixpkgs instance diff --git a/system/server/minecraft/default.nix b/system/server/minecraft/default.nix index 59348796..c95c0eb2 100644 --- a/system/server/minecraft/default.nix +++ b/system/server/minecraft/default.nix @@ -1,6 +1,7 @@ {inputs, ...}: { imports = [ - inputs.nix-minecraft.nixosModules.minecraft-servers + inputs.minecraft.overlay + inputs.minecraft.nixosModules.minecraft-servers ./servers/velocity.nix ./servers/dewdemolisher.nix ./servers/johnside.nix From a64acf37be3982cbf35303d146e09e18b0a88352 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Mon, 23 Sep 2024 11:48:02 -0400 Subject: [PATCH 2/2] Remove redundant minecraft references --- system/server/minecraft/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/server/minecraft/default.nix b/system/server/minecraft/default.nix index c95c0eb2..7dbb457c 100644 --- a/system/server/minecraft/default.nix +++ b/system/server/minecraft/default.nix @@ -1,6 +1,5 @@ {inputs, ...}: { imports = [ - inputs.minecraft.overlay inputs.minecraft.nixosModules.minecraft-servers ./servers/velocity.nix ./servers/dewdemolisher.nix @@ -9,7 +8,7 @@ ./servers/uberbeta.nix #./servers/freaktards.nix ]; - nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; + nixpkgs.overlays = [ inputs.minecraft.overlay ]; services.minecraft-servers = { enable = true;