diff --git a/modules/modules.nix b/modules/modules.nix
index 5094b7760..d8c0274b8 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -77,9 +77,11 @@ let
     ++ (lib.concatMap
       (
         dir:
-        lib.pipe dir [
-          builtins.readDir
-          (lib.filterAttrs (_path: kind: kind == "directory"))
+        lib.pipe (builtins.readDir dir) [
+          (lib.filterAttrs (path: _kind: !lib.hasPrefix "_" path))
+          (lib.filterAttrs (
+            _path: kind: kind == "directory" || (kind == "regular" && lib.hasSuffix ".nix" _path)
+          ))
           (lib.mapAttrsToList (path: _kind: lib.path.append dir path))
         ]
       )