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 | ae958bfec23ba1e7a31c8bec8af9b1c48fe33538 (patch) | |
| tree | f107d8f25145e57b2be602ca7e2ace8ea1a50a92 | |
| parent | 2568cb40d220921401e4df6f5f3d110764722d4c (diff) | |
| parent | 8717f8baa1339fbc13e16f03575da91bef28886c (diff) | |
Merge remote-tracking branch 'ni/master' into staging/test
| -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 05b4d91..07ec8e4 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 bf13a38..8b34b16 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 079013c..68fbcd1 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 = [ |