From 3974b5afcdbb55614894872924c05e02a80a48cf Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <emile@agribit.com.au>
Date: Wed, 28 Jan 2026 13:51:35 +1000
Subject: [PATCH] correct all std paths

---
 nt/mix/import.nix             |  4 ----
 nt/mix/mixture.nix            |  2 +-
 nt/primitives/nt/class.nix    | 22 +++++++++++-----------
 nt/primitives/nt/nt.nix       | 25 +++++++++++++------------
 nt/primitives/nt/sig.nix      | 12 ++++++------
 nt/primitives/nt/trapdoor.nix |  2 +-
 nt/primitives/std/attrs.nix   |  2 +-
 7 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/nt/mix/import.nix b/nt/mix/import.nix
index 0c95377..1d9af68 100644
--- a/nt/mix/import.nix
+++ b/nt/mix/import.nix
@@ -10,10 +10,6 @@
   inherit
     (nt)
     enfIsPrimitive
-    ;
-
-  inherit
-    (nt.std)
     hasInfix
     mergeAttrsList
     nameValuePair
diff --git a/nt/mix/mixture.nix b/nt/mix/mixture.nix
index 219f60d..e60c26b 100644
--- a/nt/mix/mixture.nix
+++ b/nt/mix/mixture.nix
@@ -10,7 +10,7 @@
     ;
 
   inherit
-    (nt.parse)
+    (nt)
     projectOnto
     ;
 in {
diff --git a/nt/primitives/nt/class.nix b/nt/primitives/nt/class.nix
index ed8fab7..154e2f4 100644
--- a/nt/primitives/nt/class.nix
+++ b/nt/primitives/nt/class.nix
@@ -10,28 +10,28 @@
   inherit
     (this)
     enfIsType
+    enfIsClassSig
+    ntTrapdoorKey
+    parseClassSig
     typeSig
     ;
 
+  inherit
+    (this.trapdoor)
+    mkTrapdoorSet
+    ;
+
   inherit
     (this.std)
     flip
+    hasAttrAt
+    projectOnto
     recdef
     removeAttrsRec
     ;
 
   inherit
-    (this.parse)
-    enfIsClassSig
-    hasAttrAt
-    mkTrapdoorSet
-    ntTrapdoorKey
-    parseClassSig
-    projectOnto
-    ;
-
-  inherit
-    (this.types)
+    (this.std.terminal)
     Terminal
     ;
 
diff --git a/nt/primitives/nt/nt.nix b/nt/primitives/nt/nt.nix
index 9340aae..d6483c8 100644
--- a/nt/primitives/nt/nt.nix
+++ b/nt/primitives/nt/nt.nix
@@ -11,22 +11,23 @@
     toTypeSig
     ;
 
-  inherit
-    (this.std)
-    contains
-    ;
-
-  inherit
-    (this.maybe)
-    isSome
-    bindMaybe
-    ;
-
   inherit
     (this.trapdoor)
     mkTrapdoorKey
     openTrapdoor
     ;
+
+  inherit
+    (this.std)
+    contains
+    not
+    ;
+
+  inherit
+    (this.std.maybe)
+    isSome
+    bindMaybe
+    ;
 in rec {
   ntTrapdoorKey = mkTrapdoorKey "nt";
   ntDynamicTrapdoorKey = mkTrapdoorKey "ntDyn";
@@ -34,7 +35,7 @@ in rec {
   openNT = openTrapdoor ntTrapdoorKey;
 
   # check if a value is NOT NixTypes compatible
-  isPrimitive = ! isNT;
+  isPrimitive = not isNT;
 
   # check if a value is NixTypes compatible
   isNT = T:
diff --git a/nt/primitives/nt/sig.nix b/nt/primitives/nt/sig.nix
index 084ada7..e2e4ace 100644
--- a/nt/primitives/nt/sig.nix
+++ b/nt/primitives/nt/sig.nix
@@ -14,12 +14,6 @@
     openNT
     ;
 
-  inherit
-    (this.maybe)
-    bindMaybe
-    isSome
-    ;
-
   inherit
     (this.std)
     filterEven
@@ -29,6 +23,12 @@
     stringHead
     stringTail
     ;
+
+  inherit
+    (this.std.maybe)
+    bindMaybe
+    isSome
+    ;
 in rec {
   parseSig = sig: let
     result = split "::" sig |> filterEven;
diff --git a/nt/primitives/nt/trapdoor.nix b/nt/primitives/nt/trapdoor.nix
index 0ff6579..0231188 100644
--- a/nt/primitives/nt/trapdoor.nix
+++ b/nt/primitives/nt/trapdoor.nix
@@ -11,7 +11,7 @@
     ;
 
   inherit
-    (this.maybe)
+    (this.std.maybe)
     Some
     None
     ;
diff --git a/nt/primitives/std/attrs.nix b/nt/primitives/std/attrs.nix
index 901d000..3dbd2f9 100644
--- a/nt/primitives/std/attrs.nix
+++ b/nt/primitives/std/attrs.nix
@@ -7,7 +7,7 @@
     ;
 
   inherit
-    (this.std)
+    (this)
     enfIsAttrs
     ;