diff options
| author | seth <[email protected]> | 2024-05-05 11:35:18 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-05 11:35:18 -0400 |
| commit | 34a7a042a36b63eb6b900932b1e420e4b6014a57 (patch) | |
| tree | 40dace9b4bb7b6e99c5d54165d8eb203963f5306 /lib | |
| parent | 9380483bdf038149fc308698e9f115b1474a0c85 (diff) | |
simplify some things (#353)
* flake: drop flake-parts
* flake: add back flake-parts
* flake: use flake module again for configurations
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 50 |
1 files changed, 24 insertions, 26 deletions
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; } |