correct all std paths

nt/mix/import.nix

@@ -10,10 +10,6 @@
   inherit
     (nt)
     enfIsPrimitive
-    ;
-
-  inherit
-    (nt.std)
     hasInfix
     mergeAttrsList
     nameValuePair

nt/mix/mixture.nix

@@ -10,7 +10,7 @@
     ;
 
   inherit
-    (nt.parse)
+    (nt)
     projectOnto
     ;
 in {

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)
+    (this.std.terminal)
-    enfIsClassSig
-    hasAttrAt
-    mkTrapdoorSet
-    ntTrapdoorKey
-    parseClassSig
-    projectOnto
-    ;
-
-  inherit
-    (this.types)
     Terminal
     ;
 

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:

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;

nt/primitives/nt/trapdoor.nix

@@ -11,7 +11,7 @@
     ;
 
   inherit
-    (this.maybe)
+    (this.std.maybe)
     Some
     None
     ;

nt/primitives/std/attrs.nix

@@ -7,7 +7,7 @@
     ;
 
   inherit
-    (this.std)
+    (this)
     enfIsAttrs
     ;