From b38b20a81b764bb5750c77a9a18e9839186cebf6 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 27 Jan 2025 14:20:14 -0600
Subject: [PATCH] rewrite find module

---
 .github/actions/nix/action.yml |  1 -
 lib/find-modules.nix           | 47 +++++++++++++++-------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.github/actions/nix/action.yml b/.github/actions/nix/action.yml
index b96e643..ef13735 100644
--- a/.github/actions/nix/action.yml
+++ b/.github/actions/nix/action.yml
@@ -27,7 +27,6 @@ runs:
         BTRFS: ${{ inputs.btrfs }}
       run: exec ${{ github.action_path }}/prepare.sh
 
-
     - uses: daylinmorgan/lix-gha-installer-action@released
       with:
         extra-conf: ${{ inputs.nix_conf }}
diff --git a/lib/find-modules.nix b/lib/find-modules.nix
index dd5066e..1b321e8 100644
--- a/lib/find-modules.nix
+++ b/lib/find-modules.nix
@@ -10,30 +10,25 @@ let
     ;
 in
 rec {
-  # https://github.com/balsoft/nixos-config/blob/73cc2c3a8bb62a9c3980a16ae70b2e97af6e1abd/flake.nix#L109-L120
-  findModulesList =
-    dir:
-    concatLists (
-      attrValues (
-        mapAttrs (
-          name: type:
-          if type == "regular" then
-            [
-              {
-                name = elemAt (match "(.*)\\.nix" name) 0;
-                value = dir + "/${name}";
-              }
-            ]
-          else if (readDir (dir + "/${name}")) ? "default.nix" then
-            [
-              {
-                inherit name;
-                value = dir + "/${name}";
-              }
-            ]
-          else
-            findModulesList (dir + "/${name}")
-        ) (readDir dir)
-      )
-    );
+
+  handleModule =
+    dir: name: type:
+    if type == "regular" then
+      [
+        {
+          name = elemAt (match "(.*)\\.nix" name) 0;
+          value = dir + "/${name}";
+        }
+      ]
+    else if (readDir (dir + "/${name}")) ? "default.nix" then
+      [
+        {
+          inherit name;
+          value = dir + "/${name}";
+        }
+      ]
+    else
+      findModulesList (dir + "/${name}");
+
+  findModulesList = dir: (readDir dir) |> mapAttrs (handleModule dir) |> attrValues |> concatLists;
 }