all repos — nixfiles @ dc48f429240cbacdc5a3dff6b698fc297e2ab17c

System and user configuration, managed by nix and home-manager

include local sources in pinned nix path

Alan Pearce
commit

dc48f429240cbacdc5a3dff6b698fc297e2ab17c

parent

e117d4f464b801ca7905285bc158a0dcdbf35841

3 files changed, 25 insertions(+), 23 deletions(-)

jump to
M shell.nixshell.nix
@@ -1,19 +1,7 @@
let - sources = import ./npins; - - nixpkgs = sources.nixpkgs; - pkgs = import nixpkgs { }; - inherit (pkgs) lib; - # lib = import ./lib { inherit pkgs; }; - inherit (import ./lib { inherit pkgs; }) mkNixPath fromSources; + inherit (import ./sources.nix) nixPath sources; - nixPath = builtins.concatStringsSep ":" (mkNixPath - ({ - personal = ./packages; - nixpkgs-overlays = ./overlays; - private = ./private; - } // (fromSources sources)) - ); + pkgs = import sources.nixpkgs { }; in pkgs.mkShell {
@@ -27,7 +15,6 @@ (import sources.home-manager { inherit pkgs; }).home-manager
]; shellHook = '' - export NIX_PATH="${nixPath}"; + export NIX_PATH="${builtins.concatStringsSep ":"nixPath}"; ''; - }
A sources.nix
@@ -0,0 +1,15 @@
+let + sources = import ./npins; + pkgs = import sources.nixpkgs { }; + inherit (import ./lib { inherit pkgs; }) mkNixPath fromSources; + + allSources = { + personal = ./packages; + nixpkgs-overlays = ./overlays; + private = ./private; + } // (fromSources sources); +in +{ + sources = allSources; + nixPath = mkNixPath allSources; +}
M system/settings/pin.nixsystem/settings/pin.nix
@@ -1,12 +1,12 @@
-{ pkgs, ... }: let - lib = import ../../lib { inherit pkgs; }; - sources = import ../../npins; + inherit (import ../../sources.nix) nixPath sources; in { - nix.nixPath = lib.mkNixPath sources; - nix.registry.nixpkgs.to = { - type = "path"; - path = sources.nixpkgs; + nix = { + inherit nixPath; + registry.nixpkgs.to = { + type = "path"; + path = sources.nixpkgs; + }; }; }