diff --git a/nt/mix/bootstrap.nix b/nt/mix/bootstrap.nix index 4599bdc..9be76f0 100644 --- a/nt/mix/bootstrap.nix +++ b/nt/mix/bootstrap.nix @@ -1,19 +1,7 @@ # WARNING: /nt/mix is structured as a nt.mix modules # WARNING: this file is strictly for bootstrapping mix -{ - this, - bootstrap, - ... -}: let - inputs = { - inherit bootstrap; - this = mix; - nt = this; - }; - - mix = bootstrap inputs [ - ./mix.nix - ./import.nix - ]; -in - mix +{this, ...}: +this.bootstrap {nt = this;} [ + ./mixture.nix + ./import.nix +] diff --git a/nt/mix/default.nix b/nt/mix/default.nix index 2d1c362..32c0aad 100644 --- a/nt/mix/default.nix +++ b/nt/mix/default.nix @@ -2,19 +2,14 @@ this, mix, ... -}: let - inputs = { - nt = this; - inherit mix; +}: +mix.newMixture {nt = this;} (mixture: { + includes = { + public = [ + ./mixture.nix + ]; + protected = [ + ./import.nix + ]; }; -in - mix.newMixture inputs (mixture: { - includes = { - public = [ - ./mixture.nix - ]; - protected = [ - ./import.nix - ]; - }; - }) +}) diff --git a/nt/mix/import.nix b/nt/mix/import.nix index 99c26c8..0c95377 100644 --- a/nt/mix/import.nix +++ b/nt/mix/import.nix @@ -1,4 +1,4 @@ -{this, ...}: let +{nt, ...}: let inherit (builtins) isAttrs @@ -8,12 +8,12 @@ ; inherit - (this) + (nt) enfIsPrimitive ; inherit - (this.std) + (nt.std) hasInfix mergeAttrsList nameValuePair diff --git a/nt/mix/mixture.nix b/nt/mix/mixture.nix index 44a41a4..a7df1d1 100644 --- a/nt/mix/mixture.nix +++ b/nt/mix/mixture.nix @@ -4,14 +4,14 @@ ... }: let inherit - (nt.parse) - projectOnto + (this) + mkIncludes + mkSubMods ; inherit - (this.mix) - mkIncludes - mkSubMods + (nt.parse) + projectOnto ; in { newMixture = inputs: modBuilder: let