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/2configs/home | |
| parent | 3bbbc82ae9ab9f0ac737b2ff0b55b50ae9c77b8a (diff) | |
| parent | 758660945c712b645e755e9101a9fd3d8a325c91 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/home')
| -rw-r--r-- | makefu/2configs/home/ham/default.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/home/zigbee2mqtt/default.nix (renamed from makefu/2configs/home/ham/zigbee2mqtt/default.nix) | 0 | ||||
| -rw-r--r-- | makefu/2configs/home/zigbee2mqtt/hass.nix (renamed from makefu/2configs/home/ham/zigbee2mqtt/hass.nix) | 0 | ||||
| -rw-r--r-- | makefu/2configs/home/zigbee2mqtt/osram.nix (renamed from makefu/2configs/home/ham/zigbee2mqtt/osram.nix) | 0 |
4 files changed, 1 insertions, 2 deletions
diff --git a/makefu/2configs/home/ham/default.nix b/makefu/2configs/home/ham/default.nix index e164b177f..33e406e0b 100644 --- a/makefu/2configs/home/ham/default.nix +++ b/makefu/2configs/home/ham/default.nix @@ -14,11 +14,10 @@ in { imports = [ ./nginx.nix ./mqtt.nix - ./zigbee2mqtt ./signal-rest # hass config - ./zigbee2mqtt/hass.nix + ../zigbee2mqtt/hass.nix # ./multi/flurlicht.nix ./multi/kurzzeitwecker.nix ./multi/the_playlist.nix diff --git a/makefu/2configs/home/ham/zigbee2mqtt/default.nix b/makefu/2configs/home/zigbee2mqtt/default.nix index 6ccf8b241..6ccf8b241 100644 --- a/makefu/2configs/home/ham/zigbee2mqtt/default.nix +++ b/makefu/2configs/home/zigbee2mqtt/default.nix diff --git a/makefu/2configs/home/ham/zigbee2mqtt/hass.nix b/makefu/2configs/home/zigbee2mqtt/hass.nix index faf864ba6..faf864ba6 100644 --- a/makefu/2configs/home/ham/zigbee2mqtt/hass.nix +++ b/makefu/2configs/home/zigbee2mqtt/hass.nix diff --git a/makefu/2configs/home/ham/zigbee2mqtt/osram.nix b/makefu/2configs/home/zigbee2mqtt/osram.nix index d1bf2b296..d1bf2b296 100644 --- a/makefu/2configs/home/ham/zigbee2mqtt/osram.nix +++ b/makefu/2configs/home/zigbee2mqtt/osram.nix |