diff options
| author | makefu <github@syntax-fehler.de> | 2017-12-30 14:08:53 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-12-30 14:08:53 +0100 |
| commit | 57882d08962b1e5996df7ec4347ae5700c7bc650 (patch) | |
| tree | c9f02fc47245a6c6f85aa0137b96d2c717d943ae /tv | |
| parent | a6891271f1bfd3b130dedec51961288f37853420 (diff) | |
| parent | c1ff2ddf713242f34a56861c34d815ae6985798b (diff) | |
Merge remote-tracking branch 'lass/master' into hydra
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 | ||||
| -rw-r--r-- | tv/source.nix | 2 |
4 files changed, 10 insertions, 1 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 = [ diff --git a/tv/source.nix b/tv/source.nix index f3bda2715..31308fc99 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; nixpkgs.git = { # nixos-17.09 - ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887"; + ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72"; url = https://github.com/NixOS/nixpkgs; }; secrets.file = getAttr builder { |