diff --git a/default.nix b/default.nix index 82f5fe0f..af5ac49c 100644 --- a/default.nix +++ b/default.nix @@ -26,7 +26,7 @@ let We also pass through pkgs to meta this way. */ metaConfig = import ./meta-base.nix { - inherit pkgs lib; + inherit pkgs lib depot; }; # This is where the meta config is evaluated. @@ -39,6 +39,7 @@ let specialArgs = { inherit sources; + meta = self; } // depot; }; @@ -58,4 +59,5 @@ let * do not use common, it is tf-nix specific config ingested at line 66 of config/modules/meta/deploy.nix for every target. * services -> the specialArg generated from services/ */ -in config // { inherit pkgs lib sourceCache sources; } // depot + self = config // { inherit pkgs lib sourceCache sources; } // depot; +in self diff --git a/depot/hosts/samhain/meta.nix b/depot/hosts/samhain/meta.nix index 4dd747db..22fdf83e 100644 --- a/depot/hosts/samhain/meta.nix +++ b/depot/hosts/samhain/meta.nix @@ -1,4 +1,4 @@ -{ meta, config, profiles, ... }: with lib; { +{ lib, config, profiles, ... }: with lib; { config = { deploy.targets.personal = { tf = { diff --git a/depot/modules/meta/network.nix b/depot/modules/meta/network.nix index 0c210459..569ba104 100644 --- a/depot/modules/meta/network.nix +++ b/depot/modules/meta/network.nix @@ -1,4 +1,4 @@ -{ pkgs, sources, lib, config, ... }: +{ pkgs, sources, lib, meta, config, ... }: /* This module: @@ -59,8 +59,7 @@ with lib; ]; specialArgs = { inherit (config.network) nodes; - inherit sources; - meta = config; + inherit sources meta; }; }; };