1 files changed, 17 insertions, 7 deletions
diff --git a/lib/default.nix b/lib/default.nix
index b75be10..8e95c8c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,18 @@
-inputs:
+{ inputs, lib, ...}:
 
-{
-  mkSystem = import ./mk_system.nix inputs;
-  mkHome = import ./mk_home.nix inputs;
-  nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs;
-  homeConfigurationsAsPackages = import ./home_configurations_as_packages.nix inputs;
-}
+let
+  inherit (lib) makeExtensible attrValues foldr;
+  inherit (modules) mapModules;
+
+  modules = import ./modules.nix {
+    inherit lib;
+    self.attrs = import ./attrs.nix { inherit lib; self = { }; };
+  };
+
+  mylib = makeExtensible (self:
+    mapModules ./.
+    (file: import file ({ inherit lib; } // inputs)));
+in
+mylib.extend
+  (self: super:
+  foldr (a: b: a//b) { } (attrValues super))