diff options
| author | lassulus <lassulus@lassul.us> | 2017-12-25 23:01:27 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-12-25 23:01:27 +0100 |
| commit | 3a41a73f1fcc32736ace08783d9bfee8a77f3f80 (patch) | |
| tree | 2b9f02ddb439ae403e4238a9e4f47aa5fda65878 /tv | |
| parent | b73b1c45e57e3bab0300f5ecbed261c6d45a5d53 (diff) | |
| parent | 28085c8e6d37a0dd31d7627fa01d072723c4f46c (diff) | |
Merge remote-tracking branch 'ni/master' into staging/test
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/querel/config.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/exim-retiolum.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/exim-smarthost.nix | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index 05b4d9133..07ec8e403 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -29,6 +29,7 @@ with import <stockholm/lib>; }; environment.systemPackages = with pkgs; [ + chromium firefoxWrapper gimp kate @@ -65,6 +66,8 @@ with import <stockholm/lib>; networking.networkmanager.enable = true; + nixpkgs.config.chromium.enablePepperFlash = true; + programs.ssh.startAgent = false; services.printing = { diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix index bf13a388a..8b34b16cf 100644 --- a/tv/2configs/exim-retiolum.nix +++ b/tv/2configs/exim-retiolum.nix @@ -3,6 +3,9 @@ with import <stockholm/lib>; { + environment.systemPackages = [ + pkgs.eximlog + ]; krebs.exim-retiolum.enable = true; tv.iptables.input-retiolum-accept-tcp = singleton "smtp"; } diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 079013c79..68fbcd151 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -3,6 +3,9 @@ with import <stockholm/lib>; { + environment.systemPackages = [ + pkgs.eximlog + ]; krebs.exim-smarthost = { enable = true; dkim = [ |