Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stockholm: import user lib if it exists

Browse Source
This commit is contained in:
tv 2015-11-09 18:52:11 +01:00
parent 85c25d6947
commit 1f39b86dad
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default.nix
View File

@ -17,8 +17,10 @@ let stockholm = {
let let
lib = import <nixpkgs/lib>; lib = import <nixpkgs/lib>;
klib = import ./krebs/4lib { inherit lib; }; klib = import ./krebs/4lib { inherit lib; };
#ulib = import (./. + "/${current-user-name}/4lib") { lib = lib // klib; }; ulib = let
ulib = {}; # TODO path = ./. + "/${current-user-name}/4lib";
in lib.optionalAttrs (klib.dir.has-default-nix path)
(import path { lib = lib // klib; });
in in
builtins // lib // klib // ulib // rec { builtins // lib // klib // ulib // rec {
# TODO move this stuff # TODO move this stuff

3
tv/2configs/git.nix
View File

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import ../4lib { inherit lib pkgs; }; with lib;
let let
out = { out = {