From dc48f429240cbacdc5a3dff6b698fc297e2ab17c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 6 Jun 2024 13:29:21 +0200
Subject: include local sources in pinned nix path

---
 shell.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index d1270312..f41153fc 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,19 +1,7 @@
 let
-  sources = import ./npins;
+  inherit (import ./sources.nix) nixPath sources;
 
-  nixpkgs = sources.nixpkgs;
-  pkgs = import nixpkgs { };
-  inherit (pkgs) lib;
-  # lib = import ./lib { inherit pkgs; };
-  inherit (import ./lib { inherit pkgs; }) mkNixPath fromSources;
-
-  nixPath = builtins.concatStringsSep ":" (mkNixPath
-    ({
-      personal = ./packages;
-      nixpkgs-overlays = ./overlays;
-      private = ./private;
-    } // (fromSources sources))
-  );
+  pkgs = import sources.nixpkgs { };
 in
 pkgs.mkShell
 {
@@ -27,7 +15,6 @@ pkgs.mkShell
   ];
 
   shellHook = ''
-    export NIX_PATH="${nixPath}";
+    export NIX_PATH="${builtins.concatStringsSep ":"nixPath}";
   '';
-
 }
-- 
cgit 1.4.1