src/flake/default.nix

@@ -6,6 +6,8 @@
   system,
 }:
 let
+  util = import ../dotfiles/util.nix { inherit lib; };
+
   dotfiles = import ../dotfiles {
     inherit
       inputs
@@ -27,6 +29,7 @@ in
       lib
       root
       system
+      util
       ;
   };
 

src/flake/packages.nix

@@ -3,30 +3,18 @@
   lib,
   root,
   system,
+  util,
 }:
 let
   pkgs = inputs.nixpkgs.legacyPackages.${system};
 
-  packageDirs =
+  packageFiles = builtins.filter (path: builtins.baseNameOf (toString path) == "package.nix") (
-    dir:
+    util.collectNixFiles (root + "/src")
-    lib.flatten (
+  );
-      lib.mapAttrsToList (
-        name: type:
-        let
-          path = dir + "/${name}";
-        in
-        if type == "directory" then
-          packageDirs path
-        else if type == "regular" && name == "package.nix" then
-          [ dir ]
-        else
-          [ ]
-      ) (builtins.readDir dir)
-    );
 
-  package = dir: {
+  package = packageFile: {
-    name = builtins.baseNameOf (toString dir);
+    name = builtins.baseNameOf (toString (builtins.dirOf packageFile));
-    value = import (dir + "/package.nix") {
+    value = import packageFile {
       inherit
         lib
         pkgs
@@ -35,4 +23,4 @@ let
     };
   };
 in
-builtins.listToAttrs (map package (packageDirs (root + "/src")))
+builtins.listToAttrs (map package packageFiles)