From bbe8e3a442d9988d386540769e37d7f174116b5b Mon Sep 17 00:00:00 2001
From: Archit Gupta <archit@accelbread.com>
Date: Sat, 15 Apr 2023 04:41:27 -0700
Subject: [PATCH] Export autoloadAttr

---
 default.nix | 68 +++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/default.nix b/default.nix
index 77b0a9a..316acc4 100644
--- a/default.nix
+++ b/default.nix
@@ -11,7 +11,7 @@ let
     optionalString parseDrvName pathExists pipe recursiveUpdate removePrefix
     removeSuffix zipAttrsWith;
 
-  exports = { inherit mkFlake loadNixDir systems; };
+  exports = { inherit mkFlake loadNixDir systems autoloadAttr; };
 
   baseModule = src: inputs: root: {
     withOverlays = params: [
@@ -47,40 +47,42 @@ let
     };
   };
 
-  autoAttrs = src: root:
+  autoloadAttr = src: root: attr:
     let
       nixDir = root.nixDir or (src + /nix);
-      loadAttr = attr:
-        if pathExists (nixDir + "/${attr}.nix")
-        then import (nixDir + "/${attr}.nix")
-        else if pathExists (nixDir + "/${attr}/default.nix")
-        then import (nixDir + "/${attr}")
-        else if pathExists (nixDir + "/${attr}")
-        then loadNixDir (nixDir + "/${attr}")
-        else null;
-      attrs = [
-        "withOverlay"
-        "withOverlays"
-        "package"
-        "packages"
-        "devTools"
-        "devShell"
-        "devShells"
-        "env"
-        "overlay"
-        "overlays"
-        "apps"
-        "checks"
-        "nixosModules"
-        "nixosConfigurations"
-        "templates"
-        "formatters"
-        "systems"
-        "perSystem"
-        "outputs"
-      ];
     in
-    filterAttrs (_: v: v != null) (genAttrs attrs loadAttr);
+    if pathExists (nixDir + "/${attr}.nix")
+    then import (nixDir + "/${attr}.nix")
+    else if pathExists (nixDir + "/${attr}/default.nix")
+    then import (nixDir + "/${attr}")
+    else if pathExists (nixDir + "/${attr}")
+    then loadNixDir (nixDir + "/${attr}")
+    else null;
+
+  autoAttrs = [
+    "withOverlay"
+    "withOverlays"
+    "package"
+    "packages"
+    "devTools"
+    "devShell"
+    "devShells"
+    "env"
+    "overlay"
+    "overlays"
+    "apps"
+    "checks"
+    "nixosModules"
+    "nixosConfigurations"
+    "templates"
+    "formatters"
+    "systems"
+    "perSystem"
+    "outputs"
+  ];
+
+  genAutoAttrs = src: root:
+    filterAttrs (_: v: v != null) (genAttrs autoAttrs (autoloadAttr src root));
 
   mkFlake = src: inputs: root:
     let
@@ -143,7 +145,7 @@ let
 
       root' =
         let
-          rootWithAuto = (autoAttrs src root) // root;
+          rootWithAuto = (genAutoAttrs src root) // root;
         in
         normalizeModule rootWithAuto // {
           systems = applyParams rootWithAuto.systems or systems.linuxDefault;