diff --git a/default.nix b/default.nix
index 4b0c6093..95921f55 100644
--- a/default.nix
+++ b/default.nix
@@ -15,9 +15,5 @@
   };
 
   packages = import ./nix/packages;
-
-  overlays = {
-    default = import ./nix/overlays;
-    packages = import ./nix/overlays/packages.nix;
-  };
+  overlays = import ./nix/overlays;
 }
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
index b8331e22..d08ea8b6 100644
--- a/nix/overlays/default.nix
+++ b/nix/overlays/default.nix
@@ -1,31 +1,5 @@
-let
-  sources = import ../sources.nix;
-  lib = import (sources.nixpkgs + "/lib");
-in
-  lib.composeManyExtensions [
-    (final: _: {
-      # Isabelle version 2023
-      inherit (import sources.pin-isabelle {}) isabelle;
-
-      # Wireshark bug
-      # https://gitlab.com/wireshark/wireshark/-/issues/19574
-      inherit (import sources.pin-wireshark {}) wireshark;
-
-      wallpapers = final.callPackage sources.wallpapers {};
-
-      inherit (final.callPackage sources.agenix {}) agenix;
-
-      disko =
-        final.callPackage (sources.disko + "/package.nix")
-        {diskoVersion = sources.disko.version;};
-    })
-
-    (_: prev: {
-      nur = import sources.nur {
-        nurpkgs = prev;
-        pkgs = prev;
-      };
-    })
-
-    ((import sources.wired-notify).overlays.default)
-  ]
+{
+  default = import ./top-level.nix;
+}
+// import ./by-name.nix
+// {packages = import ./packages.nix;}
diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix
new file mode 100644
index 00000000..b8331e22
--- /dev/null
+++ b/nix/overlays/top-level.nix
@@ -0,0 +1,31 @@
+let
+  sources = import ../sources.nix;
+  lib = import (sources.nixpkgs + "/lib");
+in
+  lib.composeManyExtensions [
+    (final: _: {
+      # Isabelle version 2023
+      inherit (import sources.pin-isabelle {}) isabelle;
+
+      # Wireshark bug
+      # https://gitlab.com/wireshark/wireshark/-/issues/19574
+      inherit (import sources.pin-wireshark {}) wireshark;
+
+      wallpapers = final.callPackage sources.wallpapers {};
+
+      inherit (final.callPackage sources.agenix {}) agenix;
+
+      disko =
+        final.callPackage (sources.disko + "/package.nix")
+        {diskoVersion = sources.disko.version;};
+    })
+
+    (_: prev: {
+      nur = import sources.nur {
+        nurpkgs = prev;
+        pkgs = prev;
+      };
+    })
+
+    ((import sources.wired-notify).overlays.default)
+  ]