diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index 297e94a..fc6c465 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -1,4 +1,4 @@ -{ nixpkgs, clan, lib }: +{ nixpkgs, lib }: { directory # The directory containing the machines subdirectory , specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... } @@ -20,7 +20,7 @@ let modules = [ (machineSettings name) (machines.${name} or { }) - ] ++ lib.attrValues clan.clanModules; + ]; specialArgs = specialArgs; }) (machinesDirs // machines); diff --git a/lib/default.nix b/lib/default.nix index 89ac0cc..066e88e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,4 +1,4 @@ -{ lib, clan, nixpkgs, ... }: +{ lib, nixpkgs, ... }: { findNixFiles = folder: lib.mapAttrs' @@ -14,5 +14,5 @@ jsonschema = import ./jsonschema { inherit lib; }; - buildClan = import ./build-clan { inherit lib clan nixpkgs; }; + buildClan = import ./build-clan { inherit lib nixpkgs; }; } diff --git a/lib/flake-module.nix b/lib/flake-module.nix index 517e96d..64369ec 100644 --- a/lib/flake-module.nix +++ b/lib/flake-module.nix @@ -1,5 +1,4 @@ { lib -, self , inputs , ... }: { @@ -7,7 +6,6 @@ ./jsonschema/flake-module.nix ]; flake.lib = import ./default.nix { - clan = self; inherit lib; inherit (inputs) nixpkgs; };