From 34a7a042a36b63eb6b900932b1e420e4b6014a57 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 5 May 2024 11:35:18 -0400 Subject: simplify some things (#353) * flake: drop flake-parts * flake: add back flake-parts * flake: use flake module again for configurations --- lib/default.nix | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index c6ca2ca..9a67a2e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -4,31 +4,29 @@ ... }: { flake.lib = - ( - lib.extend (final: prev: let - readDir' = dir: - prev.filterAttrs (name: ( - prev.const (name != "default.nix") - )) (builtins.readDir dir); - in { - my = - prev.recursiveUpdate - ( - prev.mapAttrs' (name: ( - prev.const ( - prev.nameValuePair - (prev.removeSuffix ".nix" name) - (import ./${name} { - lib = final; - inherit inputs; - }) - ) - )) (readDir' ./.) - ) - { - inherit readDir'; - }; - }) - ) + (lib.extend (final: prev: let + readDir' = dir: + prev.filterAttrs (name: ( + prev.const (name != "default.nix") + )) (builtins.readDir dir); + in { + my = + prev.recursiveUpdate + ( + prev.mapAttrs' (name: ( + prev.const ( + prev.nameValuePair + (prev.removeSuffix ".nix" name) + (import ./${name} { + lib = final; + inherit inputs; + }) + ) + )) (readDir' ./.) + ) + { + inherit readDir'; + }; + })) .my; } -- cgit v1.2.3