diff --git a/cerulean/nexus/nexus.nix b/cerulean/nexus/nexus.nix index dc153d5..e8c2c95 100644 --- a/cerulean/nexus/nexus.nix +++ b/cerulean/nexus/nexus.nix @@ -14,7 +14,7 @@ { this, sys, - nib, + nt, lib, deploy-rs, ... @@ -40,7 +40,7 @@ templateNexus = let inherit - (nib.types) + (nt.types) Terminal ; @@ -61,7 +61,7 @@ Cerulean Nexus config must be provided as an attribute set, got "${typeOf nexus}" instead! Ensure all the `nexus` declaration is an attribute set under your call to `cerulean.mkNexus`. '' - else nib.parse.overrideStruct templateNexus nexus; + else nt.projectOnto templateNexus nexus; mkNexus' = root: nexus': let nexus = parseNexus nexus'; diff --git a/cerulean/nexus/nodes.nix b/cerulean/nexus/nodes.nix index 781a1fa..62436b3 100644 --- a/cerulean/nexus/nodes.nix +++ b/cerulean/nexus/nodes.nix @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -{nib, ...}: let +{nt, ...}: let inherit (builtins) isAttrs @@ -22,7 +22,7 @@ in rec { # abstract node instance that stores all default values templateNode = name: system: let inherit - (nib.types) + (nt.types) Terminal ; @@ -70,7 +70,7 @@ in rec { else let templateAttrs = templateNode name nodeAttrs.system; in - nib.parse.overrideStruct templateAttrs nodeAttrs; + nt.projectOnto templateAttrs nodeAttrs; mapNodes = nodes: f: nodes diff --git a/flake.nix b/flake.nix index b31ea1d..e05292c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,42 +20,26 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nib = { - url = "github:emilelcb/nib"; - # url = "/home/me/agribit/nexus/nib"; - inputs.systems.follows = "systems"; - }; - - mix = { - url = "github:emilelcb/mix"; - # url = "/home/me/agribit/nexus/mix"; - inputs.nib.follows = "nib"; + nt = { + url = "github:emilelcb/nt"; + inputs = { + systems.follows = "systems"; + nixpkgs.follows = "nixpkgs"; + }; }; deploy-rs.url = "github:serokell/deploy-rs"; }; outputs = { - self, nixpkgs, - nixpkgs-unstable, - nib, + nt, ... - } @ inputs: let - inherit - (nixpkgs) - lib - ; - - sys = nib.mkUSys { - pkgs = nib.withPkgs nixpkgs { - config.allowUnfree = false; - overlays = builtins.attrValues self.overlays; - }; - upkgs = nib.withPkgs nixpkgs-unstable { - config.allowUnfree = false; - }; + } @ inputs: + import ./cerulean + <| inputs + // { + inherit (nixpkgs) lib; + inherit (nt) mix; }; - in - import ./cerulean <| inputs // {inherit lib sys;}; }