fn: Improve readability of fn.lst function arguments.

flake.nix

@@ -35,25 +35,25 @@
         fn = import ./fn.nix { inherit lib; };
         pkgs = nixpkgs.legacyPackages."${system}";
         machineList = fn.lst {
-          p = toString ./machines;
+          path = toString ./machines;
-          t = "directory";
+          fileType = "directory";
-          b = false;
+          fullPath = false;
         };
         nixosSystemFor = machine: {
           name = machine;
           value =
             let
               configFiles = fn.lst {
-                p = toString ./config;
+                path = toString ./config;
-                b = true;
+                fullPath = true;
               };
               pkgsFiles = fn.lst {
-                p = toString ./pkgs;
+                path = toString ./pkgs;
-                b = true;
+                fullPath = true;
               };
               serviceFiles = fn.lst {
-                p = toString ./services;
+                path = toString ./services;
-                b = true;
+                fullPath = true;
               };
               machinePath = lib.concatStringsSep "/" [
                 (toString ./.)
@@ -62,8 +62,8 @@
               ];
               machineFiles = lib.filter (lib.strings.hasSuffix ".nix") (
                 fn.lst {
-                  p = machinePath;
+                  path = machinePath;
-                  b = true;
+                  fullPath = true;
                 }
               );
             in

fn.nix

@@ -32,31 +32,33 @@ rec {
   */
   cwd = builtins.getEnv "PWD";
 
-  # lst (string PATH) (string FILETYPE) (bool RETURNFULLPATH)
+  /**
+    lst (string PATH) (string FILETYPE) (bool RETURNFULLPATH)
+  */
   lst =
     {
-      p ? cwd,
+      path ? cwd,
-      t ? "regular",
+      fileType ? "regular",
-      b ? false,
+      fullPath ? false,
     }:
-    (lists.forEach (attrNames (filterAttrs (n: v: v == t) (readDir p))) (
+    assert (builtins.isString path) || throw "Argument path needs to be a string.";
-      v: ((optionalString b "${p}/") + v)
+    (lists.forEach (attrNames (filterAttrs (n: v: v == fileType) (readDir path))) (
+      v: ((optionalString fullPath "${path}/") + v)
     ));
-  lsf = p: (lst { inherit p; });
+  lsf = path: (lst { inherit path; });
   lsd =
-    p:
+    path:
     (lst {
-      inherit p;
+      inherit path;
-      t = "directory";
+      fileType = "directory";
-      b = true;
+      fullPath = true;
     });
   lsfRec =
-    p: b:
+    path: fullPath:
     flatten (
-      (map (np: lsfRec np b) (lsd p))
+      (map (nextPath: lsfRec nextPath fullPath) (lsd path))
       ++ (lst {
-        inherit p;
+        inherit path fullPath;
-        inherit b;
       })
     );
   hasAttrs = aList: d: (map (a: (ifelse (isList a) (hasAttrByPath a d) (hasAttr a d))) aList);

pkgs/systemPackages.nix

@@ -2,15 +2,14 @@
   config,
   lib,
   fn,
-  pkgs,
   ...
 }:
 with lib;
 let
   cfg = config.machine;
   pkgsets = fn.lst {
-    p = toString ../pkgsets;
+    path = toString ../pkgsets;
-    b = true;
+    fullPath = true;
   };
 in
 {

services/desktop.nix

@@ -9,8 +9,8 @@ with lib;
 let
   cfg = config.machine;
   desktopFiles = fn.lst {
-    p = toString ./desktop;
+    path = toString ./desktop;
-    b = true;
+    fullPath = true;
   };
 in
 {