diff options
| author | lassulus <lassulus@lassul.us> | 2021-03-19 09:19:25 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2021-03-19 09:19:25 +0100 |
| commit | 86b458d5d3aaac94d51b0a860376725c0a70b6fb (patch) | |
| tree | 82407d4e8454b3abfbb8288f8bc6765c64bf036b /makefu/1systems | |
| parent | 3bbbc82ae9ab9f0ac737b2ff0b55b50ae9c77b8a (diff) | |
| parent | 758660945c712b645e755e9101a9fd3d8a325c91 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/wbob/config.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index a04593715..d44980ce7 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -93,10 +93,11 @@ in { <stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/bluetooth-mpd.nix> - <stockholm/makefu/2configs/home/ham> <stockholm/makefu/2configs/home/airsonic.nix> <stockholm/makefu/2configs/home/photoprism.nix> <stockholm/makefu/2configs/home/metube.nix> + <stockholm/makefu/2configs/home/ham> + <stockholm/makefu/2configs/home/zigbee2mqtt> { makefu.ps3netsrv = { enable = true; diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index b70b48449..f99e493bf 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -50,7 +50,7 @@ in { <stockholm/makefu/2configs/bureautomation> # new hass entry point <stockholm/makefu/2configs/bureautomation/led-fader.nix> - <stockholm/makefu/2configs/bureautomation/kalauerbot.nix> + # <stockholm/makefu/2configs/bureautomation/kalauerbot.nix> now runs in thales # <stockholm/makefu/2configs/bureautomation/visitor-photostore.nix> # <stockholm/makefu/2configs/bureautomation/mpd.nix> #mpd is only used for TTS, this is the web interface <stockholm/makefu/2configs/mqtt.nix> |