Modularize the library

The flake utilities are too specific. Not going to contribute further
crap in the world. ;p

flake.nix

@@ -33,11 +33,16 @@
       ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+
       libExtended = nixpkgs.lib.extend (final: prev:
         (import ./lib {
-          inherit inputs;
           lib = final;
-        }));
+        }) // {
+          flakeUtils = (import ./lib/flake-utils.nix {
+            inherit inputs;
+            lib = final;
+          });
+        });
 
       # The default configuration for our NixOS systems.
       hostDefaultConfig = {

lib/default.nix

@@ -1,10 +1,6 @@
-{ lib, inputs, ... }:
+{ lib, ... }:
-
-let
-  flakeUtils = import ./flake-utils.nix { inherit lib inputs; };
-in rec {
-  inherit flakeUtils;
 
+rec {
   /* Create an attribute set that represents the structure of the modules
      inside of a directory.  While it can recurse into directories, it will
      stop once it detects `default.nix` inside.

lib/flake-utils.nix

@@ -76,6 +76,6 @@ in rec {
     configuration = import file;
     homeDirectory = "/home/${username}";
     extraModules = hmModules ++ extraModules ++ [ (lib.filterAttrs (n: _: !lib.elem n hmConfigFunctionArgs) attrs) ];
-    extraSpecialArgs = { inherit system; };
+    extraSpecialArgs = { inherit lib system; };
   };
 }