@@ -1,25 +0,0 @@
-{ pkgs }:
-with builtins;
-let
-  inherit (pkgs) lib;
-in
-rec {
-  importPathStore = p: "${append ../. "/${p}"}";
-
-  mkPathable = s: toString (
-    if lib.path.subpath.isValid s
-    then (lib.path.append ../. s)
-    else s
-  );
-
-  kvPath = k: v: "${k}=${v}";
-
-  fromSources = sources:
-    lib.attrsets.mapAttrs
-      (k: v: v.outPath)
-      sources;
-
-  mkNixPath = sources: lib.attrsets.mapAttrsToList
-    (k: v: kvPath k (mkPathable v))
-    sources;
-}

@@ -1,20 +1,37 @@
 let
-  sources = import ./npins;
-  pkgs = import sources.nixpkgs { };
+  npins = import ./npins;
+  pkgs = import npins.nixpkgs { };
+
+  inherit (pkgs) lib;
+
+  mkPathable = s: toString (
+    if lib.path.subpath.isValid s
+    then (lib.path.append ../. s)
+    else s
+  );
+
+  kvPath = k: v: "${k}=${v}";
+
+  fromNpins = sources:
+    lib.attrsets.mapAttrs
+      (k: v: v.outPath)
+      sources;
+
   config =
     if pkgs.stdenv.isDarwin
     then "darwin-config"
     else "nixos-config";
-  inherit (import ./lib { inherit pkgs; }) mkNixPath fromSources;
+
+in
+{
+  nixPath = lib.attrsets.mapAttrsToList
+    (k: v: kvPath k (mkPathable v))
+    npins;
 
-  allSources = {
+  sources = {
     personal = ./packages;
     nixpkgs-overlays = ./overlays;
     private = ./private;
     ${config} = ./system/configuration.nix;
-  } // (fromSources sources);
-in
-{
-  sources = allSources;
-  nixPath = mkNixPath allSources;
+  } // (fromNpins npins);
 }