From acfc561544297880af3b5c8c567e896b240c92cc Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 11 Sep 2020 01:59:02 +0200 Subject: [PATCH 1/3] Ajout IP fixe ESPHome --- systems/LoutreOS/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 17e4955..1f7af11 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -132,6 +132,10 @@ in { ethernetAddress = "00:1f:c6:6e:d1:f1"; hostName = "minecraftos"; ipAddress = "10.30.135.35"; } { ethernetAddress = "b4:2e:99:ed:24:26"; hostName = "paul-fixe"; ipAddress = "10.30.135.71"; } + #ESPHome + { ethernetAddress = "e0:98:06:85:e9:ce"; hostName = "salonled"; ipAddress = "10.30.40.1"; } + { ethernetAddress = "e0:98:06:86:38:fc"; hostName = "bureauled"; ipAddress = "10.30.40.2"; } + # YeeLights { ethernetAddress = "04:cf:8c:b5:7e:18"; hostName = "yeelink-light-color3_miap7e18"; ipAddress = "10.40.249.0"; } { ethernetAddress = "04:cf:8c:b5:2d:28"; hostName = "yeelink-light-color3_miap2d28"; ipAddress = "10.40.249.1"; } From 9da8d39d61db879533558fa56a6355347b1f5154 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 11 Sep 2020 02:02:36 +0200 Subject: [PATCH 2/3] ajout plus d'automation --- systems/LoutreOS/services.nix | 127 ++++++++++++++++++++++++++++++---- 1 file changed, 114 insertions(+), 13 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 0a095c4..1637006 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -240,16 +240,27 @@ in home-assistant = { enable = true; - # package = pkgs.home-assistant.override { - # extraPackages = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; - # }; config = { - default_config = null; + homeassistant = { + elevation = 143; + }; + influxdb = null; + config = null; + frontend = null; + history = null; + logbook = null; + map = null; + mobile_app = null; + person = null; + script = null; + sun = null; + system_health = null; yeelight.devices = { "10.40.249.0".name = "Chambre"; "10.40.249.1".name = "Bureau"; "10.40.249.2".name = "Cuisine"; }; + esphome = null; light = [ { platform = "group"; @@ -266,6 +277,41 @@ in host = "10.30.0.1"; } ]; + tplink.switch = [ + { host = "10.30.50.7"; } + ]; + sensor = [ + { + platform = "template"; + sensors = { + serveur_amps = { + friendly_name_template = "{{ states.switch.serveur.name}} Current"; + value_template = ''{{ states.switch.serveur.attributes["current_a"] | float }}''; + unit_of_measurement = "A"; + }; + serveur_watts = { + friendly_name_template = "{{ states.switch.serveur.name}} Current Consumption"; + value_template = ''{{ states.switch.serveur.attributes["current_power_w"] | float }}''; + unit_of_measurement = "W"; + }; + serveur_total_kwh = { + friendly_name_template = "{{ states.switch.serveur.name}} Total Consumption"; + value_template = ''{{ states.switch.serveur.attributes["total_energy_kwh"] | float }}''; + unit_of_measurement = "kWh"; + }; + serveur_volts = { + friendly_name_template = "{{ states.switch.serveur.name}} Voltage"; + value_template = ''{{ states.switch.serveur.attributes["voltage"] | float }}''; + unit_of_measurement = "V"; + }; + serveur_today_kwh = { + friendly_name_template = "{{ states.switch.serveur.name}} Today's Consumption"; + value_template = ''{{ states.switch.serveur.attributes["today_energy_kwh"] | float }}''; + unit_of_measurement = "kWh"; + }; + }; + } + ]; switch = [ { platform = "wake_on_lan"; @@ -275,14 +321,71 @@ in broadcast_address = "10.30.255.255"; } ]; - automation = [ + scene = [ + { + name = "Movie"; + icon = "mdi:movie-open"; + entities = { + "light.salon" = { + state = "on"; + xy_color = [0.299 0.115]; + brightness = 50; + }; + "light.bande_led_tv" = { + state = "on"; + effect = "Movie"; + brightness = 180; + }; + "light.bande_led_bureau" = { + state = "on"; + xy_color = [0.299 0.115]; + brightness = 130; + }; + }; + } + { + name = "Home"; + icon = "mdi:home"; + entities = { + "light.salon" = { + state = "on"; + kelvin = 2700; + brightness = 255; + }; + }; + } + { + name = "Night"; + icon = "mdi:weather-night"; + entities = { + "light.salon" = { + state = "off"; + }; + "light.bande_led_tv" = { + state = "off"; + }; + "light.bande_led_bureau" = { + state = "off"; + }; + "light.chambre" = { + state = "on"; + kelvin = 1900; + brightness = 50; + }; + }; + } + ]; + automation = let + min_sun_elevation = 4; + in [ { alias = "Aziz lumière"; trigger = [ { - platform = "sun"; - event = "sunset"; - offset = "-01:00:00"; + platform = "numeric_state"; + entity_id = "sun.sun"; + value_template = "{{ state.attributes.elevation }}"; + below = min_sun_elevation; } { platform = "state"; @@ -297,14 +400,12 @@ in state = "home"; } { - condition = "time"; - after = "16:00:00"; - before = "23:00:00"; + condition = "template"; + value_template = "{{ state_attr('sun.sun', 'elevation') < ${toString min_sun_elevation} }}"; } ]; action = { - service = "light.turn_on"; - entity_id = "light.salon"; + scene = "scene.home"; }; } { From 550aba79f0e23f5707cc75aad41277e4ca7a8d20 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 11 Sep 2020 02:02:55 +0200 Subject: [PATCH 3/3] =?UTF-8?q?d=C3=A9sactivation=20script=20maison=20HS11?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- systems/LoutreOS/monitoring.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/systems/LoutreOS/monitoring.nix b/systems/LoutreOS/monitoring.nix index 9449cf0..d60beed 100644 --- a/systems/LoutreOS/monitoring.nix +++ b/systems/LoutreOS/monitoring.nix @@ -51,18 +51,6 @@ in path = "${pkgs.writeShellScriptBin "smartctl" "/run/wrappers/bin/sudo ${pkgs.smartmontools}/bin/smartctl $@"}/bin/smartctl"; }; exec= [ - { commands = [ - "${pkgs.python}/bin/python ${ - pkgs.fetchgit { - url = "https://gitlab.com/nyanloutre/tplink-smartplug.git"; - rev = "a0996112fc451b76448589698de440ad5fd6ea79"; - sha256 = "1f1625g7rfsddgk428g76p8fr7vz5gfhq3f452q17bjni3rf2pj3"; - } - }/tplink_smartplug.py -t 10.30.50.7 -c energy" - ]; - data_format = "json"; - name_suffix = "_tplink-smartplug"; - } { commands = [ "${pkgs.python3}/bin/python ${pkgs.writeText "zpool.py" ''