mod: simplify by moving overlay to corresponding module

demo/homeassistant/flake.nix

@@ -23,7 +23,6 @@
             ./configuration.nix
             selfhostblocks.nixosModules.authelia
             selfhostblocks.nixosModules.home-assistant
-            selfhostblocks.nixosModules.overlay
             selfhostblocks.nixosModules.sops
             selfhostblocks.nixosModules.ssl
             sops-nix.nixosModules.default

demo/nextcloud/flake.nix

@@ -24,7 +24,6 @@
             selfhostblocks.nixosModules.authelia
             selfhostblocks.nixosModules.nextcloud-server
             selfhostblocks.nixosModules.nginx
-            selfhostblocks.nixosModules.overlay
             selfhostblocks.nixosModules.sops
             selfhostblocks.nixosModules.ssl
             sops-nix.nixosModules.default

flake.nix

@@ -61,9 +61,6 @@
         pkgs = import patchedNixpkgs {
           inherit system;
           config.allowUnfree = true;
-          overlays = [
-            self.overlays.default
-          ];
         };
 
         # The contract dummies are used to show options for contracts.
@@ -370,13 +367,6 @@
 
       nixosModules.default = {
         imports = [
-          # We cannot use self.nixosModules.overlay otherwise it leeds to infinite recursion.
-          {
-            nixpkgs.overlays = [
-              self.overlays.default
-            ];
-          }
-
           # blocks
           self.nixosModules.authelia
           self.nixosModules.borgbackup
@@ -412,11 +402,6 @@
         ];
       };
 
-      nixosModules.overlay = {
-        nixpkgs.overlays = [
-          self.overlays.default
-        ];
-      };
       nixosModules.lib = lib/module.nix;
 
       nixosModules.authelia = modules/blocks/authelia.nix;
@@ -450,20 +435,5 @@
       nixosModules.paperless = modules/services/paperless.nix;
       nixosModules.pinchflat = modules/services/pinchflat.nix;
       nixosModules.vaultwarden = modules/services/vaultwarden.nix;
-
-      overlays.default = final: prev: {
-        # shb = self.nixosModules.lib;
-        prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
-          src = final.fetchFromGitHub {
-            owner = "ibizaman";
-            repo = prev.prometheus-systemd-exporter.pname;
-            # rev = "v${prev.prometheus-systemd-exporter.version}";
-            rev = "next_timer";
-            sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
-          };
-
-          vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
-        };
-      };
     };
 }

modules/blocks/monitoring.nix

@@ -741,6 +741,22 @@ in
           };
         };
       };
+
+      nixpkgs.overlays = [
+        (final: prev: {
+          prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
+            src = final.fetchFromGitHub {
+              owner = "ibizaman";
+              repo = prev.prometheus-systemd-exporter.pname;
+              # rev = "v${prev.prometheus-systemd-exporter.version}";
+              rev = "next_timer";
+              sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
+            };
+
+            vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
+          };
+        })
+      ];
     })
     (lib.mkIf (cfg.enable && cfg.sso.enable) {
       shb.lldap.ensureGroups = {

test/blocks/monitoring.nix

@@ -1,4 +1,4 @@
-{ lib, shb, ... }:
+{ shb, ... }:
 let
   password = "securepw";
   oidcSecret = "oidcSecret";
@@ -164,6 +164,8 @@ in
   basic = shb.test.runNixOSTest {
     name = "monitoring_basic";
 
+    node.pkgsReadOnly = false;
+
     nodes.server = {
       imports = [
         basic
@@ -178,6 +180,8 @@ in
   https = shb.test.runNixOSTest {
     name = "monitoring_https";
 
+    node.pkgsReadOnly = false;
+
     nodes.server = {
       imports = [
         basic
@@ -194,6 +198,8 @@ in
   sso = shb.test.runNixOSTest {
     name = "monitoring_sso";
 
+    node.pkgsReadOnly = false;
+
     nodes.client = {
       imports = [
         clientLoginSso