environment to module

2017-09-02 14:04:07 +02:00
parent 26ac134660
commit 201c532a67
2 changed files with 10 additions and 9 deletions
--- a/default.nix
+++ b/default.nix
@@ -250,6 +250,7 @@ in
  imports = [
    ./mail-server/clamav.nix
    ./mail-server/users.nix
+    ./mail-server/environment.nix
  ];

  config = mkIf cfg.enable {
@@ -260,11 +261,6 @@ in
              certificateScheme certificateFile keyFile certificateDirectory virusScanning;
    };

-    environment = import ./mail-server/environment.nix {
-      inherit pkgs;
-      inherit (cfg) certificateScheme;
-    };
-
    networking = import ./mail-server/networking.nix {
      inherit (cfg) domain hostPrefix enableImap enablePop3;
    };