@@ -80,30 +80,13 @@
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
-      readOverlays =
-        path:
-        let
-          content = builtins.readDir path;
-        in
-        map (n: import (path + ("/" + n))) (
-          builtins.filter (
-            n:
-            (
-              builtins.match ".*\\.nix" n != null
-              &&
-                # ignore Emacs lock files (.#foo.nix)
-                builtins.match "\\.#.*" n == null
-            )
-            || builtins.pathExists (path + ("/" + n + "/default.nix"))
-          ) (builtins.attrNames content)
-        );
-
       mkHomeConfiguration =
         { modules, system }:
         home-manager.lib.homeManagerConfiguration {
           pkgs = import nixpkgs {
             inherit system;
-            overlays = readOverlays (toString ./overlays) ++ [
+            overlays = [
+              (import ./overlays)
               agenix.overlays.default
               angrr.overlays.default
               (self: super: {
@@ -147,7 +130,8 @@ nixosConfigurations.linde = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [
           {
-            nixpkgs.overlays = (readOverlays ./overlays) ++ [
+            nixpkgs.overlays = [
+              (import ./overlays)
               angrr.overlays.default
               nur.overlays.default
               elgit.overlays.default

@@ -0,0 +1,15 @@
+self: super: {
+  firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; };
+  firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override {
+    systemLocale = "en-GB";
+  };
+  enchant = super.enchant.override {
+    withHspell = false;
+    withAspell = false;
+  };
+  rofi = super.rofi.overrideAttrs (oldAttrs: {
+    postInstall = ''
+      ln $out/bin/rofi $out/bin/dmenu
+    '';
+  });
+}

@@ -1,6 +0,0 @@
-self: super: {
-  firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; };
-  firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override {
-    systemLocale = "en-GB";
-  };
-}

@@ -1,6 +0,0 @@
-self: super: {
-  enchant = super.enchant.override {
-    withHspell = false;
-    withAspell = false;
-  };
-}

@@ -1,7 +0,0 @@
-self: super: {
-  rofi = super.rofi.overrideAttrs (oldAttrs: rec {
-    postInstall = ''
-      ln $out/bin/rofi $out/bin/dmenu
-    '';
-  });
-}