diff options
| author | lassulus <lassulus@lassul.us> | 2018-12-14 19:24:26 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-12-14 19:24:26 +0100 |
| commit | 9a9a6d0a90072890b8946266abff1d98647c52fc (patch) | |
| tree | 7b541f19ce2e5455d3ab9e2d546790c60439c07e /makefu/1systems/omo/config.nix | |
| parent | a56497f72ce37b08b49e9a1f86f3b8ddad8ad119 (diff) | |
| parent | ce60c288e588d8968535399921e6735cc05acef1 (diff) | |
Merge remote-tracking branch 'gum/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; |