pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

lib: update namespaces and cleanup exports

Browse source
This commit is contained in:
Pacman99 2021-05-02 01:12:29 -07:00
parent e837aaa875
commit 496348b8af
1 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lib/flake.nix
View file

@ -10,31 +10,23 @@
outputs = inputs@{ self, nixpkgs, deploy, devshell, utils, ... }: outputs = inputs@{ self, nixpkgs, deploy, devshell, utils, ... }:
let let
lib = nixpkgs.lib.makeExtensible (self: lib = nixpkgs.lib.makeExtensible (self:
let let combinedLib = nixpkgs.lib // self; in
attrs = import ./attrs.nix { lib = nixpkgs.lib // self; }; with self;
lists = import ./lists.nix { lib = nixpkgs.lib // self; }; utils.lib // {
strings = import ./strings.nix { lib = nixpkgs.lib // self; }; attrs = import ./attrs.nix { lib = combinedLib; };
modules = import ./modules.nix { lib = nixpkgs.lib // self; }; lists = import ./lists.nix { lib = combinedLib; };
in strings = import ./strings.nix { lib = combinedLib; };
modules = import ./modules.nix { lib = combinedLib; };
utils.lib importers = import ./importers.nix { lib = combinedLib; };
generators = import ./generators.nix { lib = combinedLib; };
//
{
os = import ./devos {
lib = nixpkgs.lib // self;
inherit utils;
};
mkFlake = { mkFlake = {
__functor = import ./mkFlake { __functor = import ./mkFlake {
lib = nixpkgs.lib // self; lib = combinedLib;
inherit deploy; inherit deploy;
}; };
evalArgs = import ./mkFlake/evalArgs.nix { lib = nixpkgs.lib // self; }; evalArgs = import ./mkFlake/evalArgs.nix { lib = combinedLib; };
}; };
pkgs-lib = import ./pkgs-lib { pkgs-lib = import ./pkgs-lib {
@ -42,28 +34,26 @@
inherit deploy devshell; inherit deploy devshell;
}; };
inherit (attrs) inherit (attrs) mapFilterAttrs genAttrs' safeReadDir concatAttrs;
mapFilterAttrs inherit (lists) profileMap collectProfiles unifyOverlays;
genAttrs'
safeReadDir
pathsToImportedAttrs
concatAttrs
filterPackages
importHosts;
inherit (lists) pathsIn collectProfiles unifyOverlays;
inherit (strings) rgxToString; inherit (strings) rgxToString;
inherit modules; inherit (importers) mkProfileAttrs pathsIn importHosts;
inherit (generators) mkSuites mkDeployNodes mkHomeConfigurations;
} }
); );
in in
{ {
lib = utils.lib // { lib = with lib; utils.lib // {
inherit attrs lists modules importers generators;
inherit (lib) inherit (lib)
mkFlake pathsIn importHosts; mkFlake
pathsIn
importHosts
mkDeployNodes
mkHomeConfigurations;
}; };
} }
// //