diff options
| author | tv <tv@krebsco.de> | 2015-11-09 18:52:11 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-11-09 18:57:20 +0100 |
| commit | 1f39b86dad2f8ddeb8008f6dda02a6dea1c369a6 (patch) | |
| tree | ef8978919c556e43adfd62a8a92b7adf6c4d12d8 | |
| parent | 85c25d6947f370c8ab8a304d7371ea9085003d3d (diff) | |
stockholm: import user lib if it exists
| -rw-r--r-- | default.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/default.nix b/default.nix index c001b8c13..d62e43a1f 100644 --- a/default.nix +++ b/default.nix @@ -17,8 +17,10 @@ let stockholm = { let lib = import <nixpkgs/lib>; klib = import ./krebs/4lib { inherit lib; }; - #ulib = import (./. + "/${current-user-name}/4lib") { lib = lib // klib; }; - ulib = {}; # TODO + ulib = let + path = ./. + "/${current-user-name}/4lib"; + in lib.optionalAttrs (klib.dir.has-default-nix path) + (import path { lib = lib // klib; }); in builtins // lib // klib // ulib // rec { # TODO move this stuff diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 63d65a630..4387be36a 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with import ../4lib { inherit lib pkgs; }; +with lib; + let out = { |