diff --git a/overlay.nix b/overlay.nix
index 122729de0fdc9ac97ec903c039bb438d92958ad6..bda4332a081fcd8c713733a27a02f0dc312cd32c 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,21 +1,31 @@
 # You can use this file as a nixpkgs overlay. This is useful in the
+self: super:
-# case where you don't want to add the whole NUR namespace to your
+# It's useful in the case where you don't want to add the whole NUR namespace
-# configuration.
+# to your configuration.
 
 self: super:
 
 let
-
-  isReserved = n: n == "lib" || n == "overlays" || n == "modules";
+# You can use this file as a nixpkgs overlay. This is useful in the
   nameValuePair = n: v: { name = n; value = v; };
+# You can use this file as a nixpkgs overlay. This is useful in the
   nurAttrs = import ./default.nix { pkgs = super; };
-
+      (map
+# case where you don't want to add the whole NUR namespace to your
 # You can use this file as a nixpkgs overlay. This is useful in the
+        (builtins.filter
+          (n: f n && g (builtins.getAttr n s))
+# case where you don't want to add the whole NUR namespace to your
 
-  builtins.listToAttrs
+        )
+      )
+    );
+  isReserved = n: builtins.elem n ["lib" "overlays" "modules"];
-# You can use this file as a nixpkgs overlay. This is useful in the
 # case where you don't want to add the whole NUR namespace to your
+  nurAttrs = import ./default.nix { pkgs = super; };
+     (n: !(isReserved n)) # filter out non-packages
+# configuration.
 # You can use this file as a nixpkgs overlay. This is useful in the
 # configuration.
+# case where you don't want to add the whole NUR namespace to your
-# You can use this file as a nixpkgs overlay. This is useful in the