From fb1ab5ec9c49bc258d8a822db3f221f04af5636a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 6 May 2024 08:42:28 +0200
Subject: [PATCH] reduce the psycho-horror aspect of the flake

---
 flake.lock           | 12 ++++++------
 flake.nix            | 15 ++-------------
 overlays/default.nix | 12 +++++++-----
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5820f65..7e54485 100644
--- a/flake.lock
+++ b/flake.lock
@@ -563,11 +563,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714763106,
-        "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
+        "lastModified": 1714906307,
+        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
+        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
         "type": "github"
       },
       "original": {
@@ -607,11 +607,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1714685007,
-        "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=",
+        "lastModified": 1714782413,
+        "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159",
+        "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 995dd31..33c77e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,11 +39,6 @@
           url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch";
           hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o=";
         }
-        {
-          # xdg term
-          url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/303225.patch";
-          hash = "sha256-+CBCMeBc5NqtjaUUTX1DBKhlFlKf1G6ovWrAo6xHH+I=";
-        }
       ];
 
       customNixosSystem = system: definitions:
@@ -52,7 +47,6 @@
             inherit system;
             config.allowUnfree = true;
           };
-          overlays = if (builtins.hasAttr "overlays" definitions) then definitions.overlays else [ ];
           unpatched = nixpkgs.legacyPackages.${system};
           patched = unpatched.applyPatches {
             name = "nixpkgs-patched";
@@ -63,22 +57,17 @@
         in
         nixosSystem ({
           inherit system;
-          modules = definitions.modules ++ [
-            ({ config, lib, ... }: {
-              nixpkgs.overlays = map (f: (final: prev: (import f { inherit final prev lib config; }))) overlays;
-            })
-          ];
           specialArgs = { inherit inputs system stable; };
-        } // builtins.removeAttrs definitions [ "overlays" "modules" ]);
+        } // definitions);
     in
     {
       nixosConfigurations = {
         grimmauld-nixos = customNixosSystem "x86_64-linux" {
-          overlays = import ./overlays;
           modules = [
             agenix.nixosModules.default
             chaotic.nixosModules.default
             nix-gaming.nixosModules.pipewireLowLatency
+            ./overlays
             ./common
             ./specific/grimm-nixos-laptop/configuration.nix
             ./configuration.nix
diff --git a/overlays/default.nix b/overlays/default.nix
index 5d32e4f..dc81283 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,5 +1,7 @@
-[
-  ./deskwhich.nix
-  ./mcontrolcenter.nix
-  ./the-powder-toy.nix
-]
+{ config, lib, ... }: {
+  nixpkgs.overlays = map (f: (final: prev: (import f { inherit final prev lib config; }))) [
+    ./deskwhich.nix
+    ./mcontrolcenter.nix
+    ./the-powder-toy.nix
+  ];
+}