From b8cf22c6536dd7e03f8b68c2ee15357841241005 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 6 Jun 2024 12:10:59 +0200 Subject: [PATCH] update clanlib.nix --- flake.nix | 2 +- nixos/lib/clanlib.nix | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 3ad880b..226b78a 100644 --- a/flake.nix +++ b/flake.nix @@ -169,7 +169,7 @@ inherit private_assets; assets = ./nixos/assets; 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; }; }; }; diff --git a/nixos/lib/clanlib.nix b/nixos/lib/clanlib.nix index 4c365d5..9318493 100644 --- a/nixos/lib/clanlib.nix +++ b/nixos/lib/clanlib.nix @@ -1,13 +1,7 @@ -{lib, machineDir, ... }: +{ lib, machineDir, ... }: let - allMachineNames = - let - #machineDir = "${config.clanCore.clanDir}/machines/"; - #machineDir = ../../machines; - machines = lib.mapAttrsToList (name: _: name) (builtins.readDir machineDir); - in - machines; + allMachineNames = lib.mapAttrsToList (name: _: name) (builtins.readDir machineDir); getFactPath = fact: machine: "${machineDir}/${machine}/facts/${fact}";