diff --git a/nix/overlay.nix b/nix/overlay.nix index 27d12a8..1044f44 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -2,20 +2,16 @@ nixpkgs, ragenix, ... -}: let - inherit (nixpkgs) lib; +}: +with nixpkgs.lib; let localOverlays = - lib.mapAttrs' - (f: _: - lib.nameValuePair - (lib.removeSuffix ".nix" f) - (import (./overlays + "/${f}"))) + mapAttrs' + (f: _: nameValuePair (removeSuffix ".nix" f) (import (./overlays + "/${f}"))) (builtins.readDir ./overlays); in localOverlays // { - default = lib.composeManyExtensions ((lib.attrValues localOverlays) - ++ [ - ragenix.overlays.default - ]); + default = + composeManyExtensions ((attrValues localOverlays) + ++ [ragenix.overlays.default]); } diff --git a/nix/overlays/scripts/default.nix b/nix/overlays/scripts/default.nix index d9a817f..e215bf0 100644 --- a/nix/overlays/scripts/default.nix +++ b/nix/overlays/scripts/default.nix @@ -1,8 +1,7 @@ final: prev: with prev.lib; with builtins; - composeManyExtensions - ( + composeManyExtensions ( map (f: import (./. + "/${f}")) (remove "default.nix" (attrNames (readDir ./.)))