diff options
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 24 | 
1 files changed, 13 insertions, 11 deletions
| diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 060b4445d..c06f3754e 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -1,6 +1,6 @@  { config, lib, ... }: -with lib; +with config.krebs.lib;  let    cfg = config.krebs; @@ -9,9 +9,9 @@ let        ./apt-cacher-ng.nix        ./backup.nix        ./bepasty-server.nix -      ./build.nix        ./buildbot/master.nix        ./buildbot/slave.nix +      ./build.nix        ./current.nix        ./exim-retiolum.nix        ./exim-smarthost.nix @@ -20,19 +20,21 @@ let        ./git.nix        ./go.nix        ./iptables.nix +      ./lib.nix        ./nginx.nix        ./nixpkgs.nix        ./per-user.nix        ./Reaktor.nix -      ./retiolum-bootstrap.nix        ./realwallpaper.nix +      ./retiolum-bootstrap.nix        ./retiolum.nix +      ./setuid.nix        ./tinc_graphs.nix        ./urlwatch.nix        ./repo-sync.nix      ];      options.krebs = api; -    config = mkIf cfg.enable imp; +    config = lib.mkIf cfg.enable imp;    };    api = { @@ -83,13 +85,13 @@ let      };    }; -  imp = mkMerge [ -    { krebs = import ./lass { inherit lib; }; } -    { krebs = import ./makefu { inherit lib; }; } -    { krebs = import ./miefda { inherit lib; }; } -    { krebs = import ./mv { inherit lib; }; } -    { krebs = import ./shared { inherit lib; }; } -    { krebs = import ./tv { inherit lib; }; } +  imp = lib.mkMerge [ +    { krebs = import ./lass   { inherit config lib; }; } +    { krebs = import ./makefu { inherit config lib; }; } +    { krebs = import ./miefda { inherit config lib; }; } +    { krebs = import ./mv     { inherit config lib; }; } +    { krebs = import ./shared { inherit config lib; }; } +    { krebs = import ./tv     { inherit config lib; }; }      {        krebs.dns.providers = {          de.krebsco = "zones"; | 
