From b311d7f8459fe1e90f7b0cbf5862b22a2cbedff5 Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 23 Jan 2024 00:20:54 +0900 Subject: feat(lib)!: refactor --- lib/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'lib/default.nix') 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)) -- cgit 1.4.1