summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-09-05 12:17:59 +0200
committerlassulus <lass@aidsballs.de>2015-09-05 12:17:59 +0200
commitf54a0a9ea7fd5a9902a5b38786da42f06d615b5a (patch)
treed7c475b212d8acc35a5dc7d20ec1f2228c664010 /default.nix
parentf3c1727659c59ff638b1adead8e30ee2f79f39de (diff)
parentd6d9956abc60548c755d30e6a5bd13c10abbb181 (diff)
Merge branch 'makefu'
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/default.nix b/default.nix
index 59a76f81b..875f0d5b4 100644
--- a/default.nix
+++ b/default.nix
@@ -8,6 +8,12 @@ let
"${user-name}/1systems/${system-name}.nix"
"${user-name}/3modules"
"krebs/3modules"
+ ] ++ [
+ ({ lib, pkgs, ... }: {
+ _module.args.pkgs =
+ (import ./krebs/5pkgs { inherit lib pkgs; }) //
+ (import (./. + "/${user-name}/5pkgs") { inherit lib pkgs; });
+ })
];
};