From f9204c1f0ad564e1f9c04fed9e7c7624a20178c3 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 18 Oct 2020 21:05:01 +0200 Subject: [PATCH] home-assistant: neue wohnung wip --- configs/pepe/configuration.nix | 8 +- configs/pepe/home-assistant/light-control.nix | 216 +++++++++--------- configs/pepe/syncthing.nix | 2 +- 3 files changed, 118 insertions(+), 108 deletions(-) diff --git a/configs/pepe/configuration.nix b/configs/pepe/configuration.nix index 88d5a42..e29923b 100644 --- a/configs/pepe/configuration.nix +++ b/configs/pepe/configuration.nix @@ -6,11 +6,11 @@ ./hardware-configuration.nix ./home-assistant.nix - ./kodi.nix + #./kodi.nix ./syncthing.nix ./tinc.nix ./wifi-access-point.nix - ./lan.nix + #./lan.nix ./dms.nix ./borg.nix @@ -28,10 +28,12 @@ # networking # ---------- system.custom.wifi = { - enable = true; + enable = false; interfaces = [ "wlp3s0" ]; configurationFile = ; }; + # just enable lan + networking.dhcpcd.allowInterfaces = [ "enp0s25" ]; # nix-shell -p speedtest_cli --run speedtest configuration.fireqos = { enable = true; diff --git a/configs/pepe/home-assistant/light-control.nix b/configs/pepe/home-assistant/light-control.nix index d88bcb3..2b40bc4 100644 --- a/configs/pepe/home-assistant/light-control.nix +++ b/configs/pepe/home-assistant/light-control.nix @@ -8,32 +8,34 @@ user = "homeassistant"; password = "hallo"; }; - scenes = [ - { name = "default"; } - { - name = "outside"; - room_tracking_enabled = false; - ignored_sensors = [ "zigbee2mqtt/door_sensor_4" ]; - } - { - name = "cooking"; - enabled_switches = [ "stat/PAL07/RESULT" "stat/PAL08/RESULT" ]; - } - { - name = "night"; - room_tracking_enabled = false; - brightness = 25; - disabled_switches = [ - "stat/PAL01/RESULT" - "stat/PAL03/RESULT" - "stat/PAL04/RESULT" - "stat/PAL07/RESULT" - "stat/PAL08/RESULT" - "zigbee2mqtt/light_2" - ]; - ignored_sensors = [ "zigbee2mqtt/motion_sensor_7" ]; - } - ]; + scenes = [{ + name = "default"; + room_tracking_enabled = false; + } + #{ + # name = "outside"; + # room_tracking_enabled = false; + # ignored_sensors = [ "zigbee2mqtt/door_sensor_4" ]; + #} + #{ + # name = "cooking"; + # enabled_switches = [ "stat/PAL07/RESULT" "stat/PAL08/RESULT" ]; + #} + #{ + # name = "night"; + # room_tracking_enabled = false; + # brightness = 25; + # disabled_switches = [ + # "stat/PAL01/RESULT" + # "stat/PAL03/RESULT" + # "stat/PAL04/RESULT" + # "stat/PAL07/RESULT" + # "stat/PAL08/RESULT" + # "zigbee2mqtt/light_2" + # ]; + # ignored_sensors = [ "zigbee2mqtt/motion_sensor_7" ]; + #} + ]; sensors = let door = { topic, room }: { topic = topic; @@ -49,46 +51,50 @@ delay = 60; }; in [ - (motion { - topic = "zigbee2mqtt/motion_sensor_2"; - room = "bed_room"; - }) - (motion { - topic = "zigbee2mqtt/motion_sensor_7"; - room = "bed_room"; - }) (motion { topic = "zigbee2mqtt/motion_sensor_1"; - room = "kitchen"; + room = "office_room"; }) (motion { - topic = "zigbee2mqtt/motion_sensor_3"; - room = "living_room"; - }) - (motion { - topic = "zigbee2mqtt/motion_sensor_4"; - room = "living_room"; - }) - (motion { - topic = "zigbee2mqtt/motion_sensor_5"; - room = "bath_room"; - }) - (motion { - topic = "zigbee2mqtt/motion_sensor_8"; - room = "bath_room"; - }) - (motion { - topic = "zigbee2mqtt/motion_sensor_6"; - room = "floor"; - }) - (door { - topic = "zigbee2mqtt/door_sensor_2"; - room = "floor"; - }) - (door { - topic = "zigbee2mqtt/door_sensor_4"; - room = "floor"; + topic = "zigbee2mqtt/motion_sensor_2"; + room = "office_room"; }) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_7"; + # room = "bed_room"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_1"; + # room = "kitchen"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_3"; + # room = "living_room"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_4"; + # room = "living_room"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_5"; + # room = "bath_room"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_8"; + # room = "bath_room"; + #}) + #(motion { + # topic = "zigbee2mqtt/motion_sensor_6"; + # room = "floor"; + #}) + #(door { + # topic = "zigbee2mqtt/door_sensor_2"; + # room = "floor"; + #}) + #(door { + # topic = "zigbee2mqtt/door_sensor_4"; + # room = "floor"; + #}) ]; switches = let sonoff = { id, rooms, delay ? 0 }: { @@ -117,55 +123,57 @@ }; }; in [ - (light { - topic = "zigbee2mqtt/light_1"; - rooms = [ "floor" ]; - }) + #(light { + # topic = "zigbee2mqtt/light_1"; + # rooms = [ "floor" ]; + #}) + #(light { + # topic = "zigbee2mqtt/light_2"; + # rooms = [ "floor" ]; + #}) + #(light { + # topic = "zigbee2mqtt/light_3"; + # rooms = [ "living_room" ]; + # delay = 10; + #}) + (light { topic = "zigbee2mqtt/light_2"; - rooms = [ "floor" ]; - }) - (light { - topic = "zigbee2mqtt/light_3"; - rooms = [ "living_room" ]; - delay = 10; + rooms = [ "office_room" ]; }) (light { topic = "zigbee2mqtt/light_4"; - rooms = [ "bath_room" ]; - }) - (light { - topic = "zigbee2mqtt/light_8"; - rooms = [ "bed_room" ]; - delay = 10; - }) - (sonoff { - id = "PAL01"; - rooms = [ "bed_room" ]; - }) - (sonoff { - id = "PAL03"; - rooms = [ "living_room" ]; - }) - (sonoff { - id = "PAL04"; - rooms = [ "bed_room" ]; - }) - (sonoff { - id = "PAL06"; - rooms = [ "kitchen" ]; - }) - # monitor and speakers - (sonoff { - id = "PAL07"; - rooms = [ "bed_room" ]; - delay = 180; - }) - (sonoff { - id = "PAL08"; - rooms = [ "bed_room" ]; - delay = 180; + rooms = [ "office_room" ]; }) + + #(sonoff { + # id = "PAL01"; + # rooms = [ "bed_room" ]; + #}) + #(sonoff { + # id = "PAL03"; + # rooms = [ "living_room" ]; + #}) + #(sonoff { + # id = "PAL04"; + # rooms = [ "bed_room" ]; + #}) + #(sonoff { + # id = "PAL06"; + # rooms = [ "kitchen" ]; + #}) + ## monitor and speakers + #(sonoff { + # id = "PAL07"; + # rooms = [ "bed_room" ]; + # delay = 180; + #}) + #(sonoff { + # id = "PAL08"; + # rooms = [ "bed_room" ]; + # delay = 180; + #}) + ]; }; diff --git a/configs/pepe/syncthing.nix b/configs/pepe/syncthing.nix index 288e14e..8572b05 100644 --- a/configs/pepe/syncthing.nix +++ b/configs/pepe/syncthing.nix @@ -3,7 +3,7 @@ users.groups."syncthing".members = [ "mpd" "syncthing" "kodi" ]; custom.samba-share = { - enable = true; + enable = false; folders = { movies = config.test.services.syncthing.declarative.folders.movies.path; music =