diff options
author | tv <tv@krebsco.de> | 2018-12-18 20:17:03 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-12-18 20:17:03 +0100 |
commit | 1fa1fa53062069de970548f88ad0211b4502f18d (patch) | |
tree | 30413fa29c1c43ff7af5ea684d92e613de4af295 /makefu/1systems/omo/config.nix | |
parent | 8b4428816d1385e1dd5ec9bf0ce44ae0e284130a (diff) | |
parent | 23562e36190e07f338211541ac3d2cc77ebdbafa (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/omo/config.nix')
-rw-r--r-- | makefu/1systems/omo/config.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 260f96081..81b1e0ea1 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -44,7 +44,8 @@ in { # <stockholm/makefu/2configs/share/omo-timemachine.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> - + # statistics + <stockholm/makefu/2configs/stats/client.nix> # Logging #influx + grafana <stockholm/makefu/2configs/stats/server.nix> @@ -74,7 +75,8 @@ in { "homeassistant-0.77.2" ]; } - <stockholm/makefu/2configs/deployment/homeautomation> + <stockholm/makefu/2configs/homeautomation> + <stockholm/makefu/2configs/homeautomation/google-muell.nix> { makefu.ps3netsrv = { enable = true; |