diff options
| author | tv <tv@krebsco.de> | 2017-12-27 17:09:35 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-12-27 17:09:35 +0100 |
| commit | 6ed214fc77b537dc74b92bbc37e2d2d68dfd9131 (patch) | |
| tree | 97e0ca20812fa54edfa0bd60460800ff2f18626e /krebs/3modules/default.nix | |
| parent | 04b711f516c978e84b334a82008d40dfaad1de1b (diff) | |
| parent | 3a41a73f1fcc32736ace08783d9bfee8a77f3f80 (diff) | |
Merge remote-tracking branch 'prism/staging/test'
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index caeef2885..9c343309a 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -44,6 +44,7 @@ let ./tinc_graphs.nix ./urlwatch.nix ./repo-sync.nix + ./xresources.nix ./zones.nix ]; options.krebs = api; @@ -104,8 +105,9 @@ let }; imp = lib.mkMerge [ - { krebs = import ./lass { inherit config; }; } + { krebs = import ./jeschli { inherit config; }; } { krebs = import ./krebs { inherit config; }; } + { krebs = import ./lass { inherit config; }; } { krebs = import ./makefu { inherit config; }; } { krebs = import ./mv { inherit config; }; } { krebs = import ./nin { inherit config; }; } |