From f038ba8bf3608f5a770c6a1424adf04be96849de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 7 Oct 2023 20:14:16 +0200
Subject: [PATCH] refactor: load overlays differently

---
 flake.nix            |  1 +
 modules/default.nix  | 31 +-------------------------
 overlays/default.nix | 52 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/flake.nix b/flake.nix
index ee580d9..906457a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,6 +59,7 @@
         ./modules
         ./hosts
         ./users
+        ./overlays
       ];
 
       perSystem = args@{ system, pkgs, lib, config, ... }: {
diff --git a/modules/default.nix b/modules/default.nix
index 7f67461..5c8eeaf 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,7 +3,6 @@
   inputs,
   ...
 }: {
-  # Configuration common to all Linux systems
   flake = {
     nixosModules = rec {
       arduino = import ./arduino;
@@ -31,35 +30,7 @@
         inputs.agenix.nixosModules.default
         inputs.musnix.nixosModules.musnix
 
-        ({ ... }: {
-          nixpkgs.overlays = [
-            (final: prev: {
-              nixd = inputs.nixpkgs-unstable.legacyPackages.${prev.system}.nixd;
-
-              cups-brother-hl3140cw = (import inputs.hl3140cw-arm {
-                system = prev.system;
-                config.allowUnfree = true;
-              }).cups-brother-hl3140cw;
-
-              factorio-headless = inputs.nixpkgs-master.legacyPackages.${prev.system}.factorio-headless;
-              paperless-ngx = inputs.nixpkgs-master.legacyPackages.${prev.system}.paperless-ngx;
-              waybar = inputs.nixpkgs-master.legacyPackages.${prev.system}.waybar;
-              element-desktop = inputs.nixpkgs-master.legacyPackages.${prev.system}.element-desktop;
-              signal-desktop = inputs.nixpkgs-master.legacyPackages.${prev.system}.signal-desktop;
-
-              scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless;
-
-              adlist = inputs.adblock-unbound.packages.${prev.system};
-            })
-          ] ++ (import ../overlays);
-
-          nix.nixPath = [
-            "nixpkgs=${inputs.nixpkgs}"
-            "nixos-config=${../lib/compat/nixos}"
-            "home-manager=${inputs.home-manager}"
-          ];
-        })
-
+        self.nixosModules.overlays
         self.nixosModules.core
         self.nixosModules.crypto
         self.nixosModules.nix
diff --git a/overlays/default.nix b/overlays/default.nix
index aa0d0ea..27401c6 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +1,44 @@
-[
-  (import ../pkgs)
-  (import ./blesh.nix)
-  (import ./manix.nix)
-  (import ./rnix-lsp.nix)
-  (import ./neovim-plugins.nix)
-  (import ./signal-desktop.nix)
-]
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake = {
+    nixosModules = rec {
+      overlays = ({ ... }: {
+        nixpkgs.overlays = [
+          (final: prev: {
+            nixd = inputs.nixpkgs-unstable.legacyPackages.${prev.system}.nixd;
+
+            cups-brother-hl3140cw = (import inputs.hl3140cw-arm {
+              system = prev.system;
+              config.allowUnfree = true;
+            }).cups-brother-hl3140cw;
+
+            factorio-headless = inputs.nixpkgs-master.legacyPackages.${prev.system}.factorio-headless;
+            paperless-ngx = inputs.nixpkgs-master.legacyPackages.${prev.system}.paperless-ngx;
+            waybar = inputs.nixpkgs-master.legacyPackages.${prev.system}.waybar;
+            element-desktop = inputs.nixpkgs-master.legacyPackages.${prev.system}.element-desktop;
+            signal-desktop = inputs.nixpkgs-master.legacyPackages.${prev.system}.signal-desktop;
+
+            scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless;
+
+            adlist = inputs.adblock-unbound.packages.${prev.system};
+          })
+          (import ../pkgs)
+          (import ./blesh.nix)
+          (import ./manix.nix)
+          (import ./rnix-lsp.nix)
+          (import ./neovim-plugins.nix)
+          (import ./signal-desktop.nix)
+        ];
+
+        nix.nixPath = [
+          "nixpkgs=${inputs.nixpkgs}"
+          "nixos-config=${../lib/compat/nixos}"
+          "home-manager=${inputs.home-manager}"
+        ];
+      });
+    };
+  };
+}