update clanlib.nix
This commit is contained in:
parent
6b4496a926
commit
b8cf22c653
2 changed files with 3 additions and 9 deletions
|
@ -169,7 +169,7 @@
|
||||||
inherit private_assets;
|
inherit private_assets;
|
||||||
assets = ./nixos/assets;
|
assets = ./nixos/assets;
|
||||||
factsGenerator = clan-fact-generators.lib { inherit pkgs; };
|
factsGenerator = clan-fact-generators.lib { inherit pkgs; };
|
||||||
clanLib = import ./nixos/lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; } ;
|
clanLib = import ./nixos/lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,7 @@
|
||||||
{lib, machineDir, ... }:
|
{ lib, machineDir, ... }:
|
||||||
let
|
let
|
||||||
|
|
||||||
allMachineNames =
|
allMachineNames = lib.mapAttrsToList (name: _: name) (builtins.readDir machineDir);
|
||||||
let
|
|
||||||
#machineDir = "${config.clanCore.clanDir}/machines/";
|
|
||||||
#machineDir = ../../machines;
|
|
||||||
machines = lib.mapAttrsToList (name: _: name) (builtins.readDir machineDir);
|
|
||||||
in
|
|
||||||
machines;
|
|
||||||
|
|
||||||
getFactPath = fact: machine:
|
getFactPath = fact: machine:
|
||||||
"${machineDir}/${machine}/facts/${fact}";
|
"${machineDir}/${machine}/facts/${fact}";
|
||||||
|
|
Loading…
Reference in a new issue