Revamp to get lib overlays working. Base16 in console.

This commit is contained in:
kat witch 2021-07-04 23:45:04 +01:00
parent 61289c7253
commit 3903bc1766
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
11 changed files with 85 additions and 76 deletions

View file

@ -12,23 +12,22 @@ rec {
inherit (import ./lib/hosts.nix {
inherit pkgs sources profiles users;
inherit (deploy) target;
})
hosts targets;
}) hosts targets;
inherit (pkgs) lib;
inherit (pkgs) lib;
runners = import ./runners.nix { inherit lib; inherit (deploy) target; };
runners = import ./runners.nix { inherit lib; inherit (deploy) target; };
sourceCache = with lib; let
getSources = sources: removeAttrs sources [ "__functor" "dorkfiles" ];
source2drv = value: if isDerivation value.outPath then value.outPath else value;
sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources);
in recurseIntoAttrs rec {
local = sources2drvs sources;
hexchen = sources2drvs (import sources.hexchen {}).sources;
all = attrValues local ++ attrValues hexchen;
allStr = toString all;
};
sourceCache = with lib; let
getSources = sources: removeAttrs sources [ "__functor" "dorkfiles" ];
source2drv = value: if isDerivation value.outPath then value.outPath else value;
sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources);
in recurseIntoAttrs rec {
local = sources2drvs sources;
hexchen = sources2drvs (import sources.hexchen {}).sources;
all = attrValues local ++ attrValues hexchen;
allStr = toString all;
};
deploy = import ./lib/deploy.nix {
inherit pkgs sources;