diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-15 15:18:20 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-15 15:18:20 +0200 |
| commit | a8816bcfe351c1fe9e1a00b27707b56eb544d390 (patch) | |
| tree | b6aadaa1cde000d791699925dd67bde38046b411 /tv/1systems | |
| parent | 96f13eb838f9bee37a980170f281d3839deb2719 (diff) | |
| parent | 2c65fed39714164ff4b28e3352440538ae262c79 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/cd.nix | 1 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 4f66b3592..4f196095b 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -30,6 +30,7 @@ with lib; #../2configs/consul-server.nix ../2configs/exim-smarthost.nix ../2configs/git.nix + ../2configs/urlwatch.nix { imports = [ ../2configs/charybdis.nix ]; tv.charybdis = { diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index e54aed056..0ef846f93 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -32,7 +32,6 @@ with lib; ../2configs/xserver.nix ../2configs/synaptics.nix # TODO w110er if xserver is enabled ../2configs/test.nix - ../2configs/urlwatch.nix { environment.systemPackages = with pkgs; [ |