utils: now lives in lib.utils globally
This commit is contained in:
parent
e7153d31fe
commit
c9944b411e
@ -16,8 +16,8 @@
|
||||
overlays = self.overlays;
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = let configs = import ./hosts args;
|
||||
|
||||
nixosConfigurations =
|
||||
let configs = import ./hosts ({ lib = pkgs.lib; } // args);
|
||||
in configs;
|
||||
|
||||
overlay = import ./pkgs;
|
||||
|
@ -1,8 +1,6 @@
|
||||
args@{ home, nixpkgs, self, ... }:
|
||||
args@{ lib, home, nixpkgs, self, ... }:
|
||||
let
|
||||
utils = import ../lib/utils.nix { lib = nixpkgs.lib; };
|
||||
|
||||
inherit (utils) recImport;
|
||||
inherit (lib.utils) recImport;
|
||||
|
||||
inherit (builtins) attrValues removeAttrs;
|
||||
|
||||
|
@ -11,6 +11,7 @@ in rec {
|
||||
# attrs
|
||||
mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs);
|
||||
|
||||
# used in hosts/default.nix
|
||||
recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
|
||||
mapFilterAttrs (_: v: v != null) (n: v:
|
||||
if n != "default.nix" && hasSuffix ".nix" n && v == "regular"
|
||||
|
@ -3,4 +3,5 @@ final: prev: {
|
||||
prev.callPackage ./applications/display-managers/sddm/themes/chili { };
|
||||
dejavu_nerdfont = prev.callPackage ./data/fonts/dejavu-nerdfont { };
|
||||
purs = prev.callPackage ./shells/zsh/purs { };
|
||||
lib = prev.lib // { utils = import ../lib/utils.nix { lib = prev.lib; }; };
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user