From a603eb08a4c6712020262e30336d8ec0c49016e3 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 16 Mar 2025 23:32:39 +0100
Subject: [PATCH] integrate overlays

---
 default.nix | 5 -----
 flake.nix   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index e5679d7..ee677f4 100644
--- a/default.nix
+++ b/default.nix
@@ -16,11 +16,6 @@ in
     ]
     ++ (mapModulesRec' (toString ./modules) import);
 
-  nixpkgs.overlays = [
-    inputs.nix-minecraft.overlay
-    inputs.flux.overlays.default
-  ];
-
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   environment.variables = {
diff --git a/flake.nix b/flake.nix
index a82b93a..6211323 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
     sops-nix.url = "github:Mic92/sops-nix";
   };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }:
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nix-minecraft, flux, ... }:
   let
     inherit (lib.my) mapModules mapModulesRec mapHosts;
 
@@ -53,7 +53,7 @@
         ];
         overlays = extraOverlays ++ (lib.attrValues self.overlays);
       };
-    pkgs = mkPkgs nixpkgs [self.overlays.default];
+    pkgs = mkPkgs nixpkgs [self.overlays.default nix-minecraft.overlay flux.overlays.default];
     pkgs-unstable = mkPkgs nixpkgs-unstable [];
 
     lib = nixpkgs.lib.extend (final: prev: {