From 64a930f8445dfdb666596ffc2f6011dc25c585fa Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Fri, 8 Sep 2023 10:18:06 +0200
Subject: [PATCH] Created template folders and minor changes

---
 automations/speech.yaml                       |  2 +-
 configuration.yaml                            | 35 +++++++++++--------
 scripts/speech_engine.yaml                    |  2 +-
 .../speech.yaml                               |  0
 .../welcome.yaml                              |  0
 5 files changed, 23 insertions(+), 16 deletions(-)
 rename templates/speech_message.yaml => template_messages/speech.yaml (100%)
 rename templates/welcome_message.yaml => template_messages/welcome.yaml (100%)

diff --git a/automations/speech.yaml b/automations/speech.yaml
index c8cb2686..0a1ab631 100644
--- a/automations/speech.yaml
+++ b/automations/speech.yaml
@@ -32,7 +32,7 @@
 
     - service: script.speech_engine
       data_template:
-        message: !include ../templates/welcome_message.yaml
+        message: !include ../template_messages/welcome.yaml
         enable_greeting: 0
 
 ######################################################################
diff --git a/configuration.yaml b/configuration.yaml
index d7236ae4..1f3f9f12 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -49,18 +49,12 @@ http:
 automation: !include automations.yaml
 automation manual: !include_dir_merge_list automations/
 
-# Assist pipeline
-# assist_pipeline:
-
 # Backup
 backup:
 
 # Enables configuration UI
 config:
 
-# Conversation
-conversation:
-
 # Counter
 counter: !include_dir_merge_named counters/
 
@@ -71,6 +65,9 @@ energy:
 frontend:
   themes: !include_dir_merge_named themes
 
+# Hardware
+# hardware:
+
 # Home Assistant Alerts
 homeassistant_alerts:
 
@@ -80,9 +77,6 @@ homeassistant_alerts:
 # Image upload
 image_upload:
 
-# Hardware
-# hardware:
-
 # Inputs
 input_boolean: !include_dir_merge_named input_boolean/
 input_button: !include_dir_merge_named input_button/
@@ -110,14 +104,14 @@ person:
 schedule:
 
 # Scene
-#scene: !include_dir_merge_list scenes.yaml
+# scene: !include_dir_merge_list scenes.yaml
 
 # Scripts
 script: !include scripts.yaml
 script manual: !include_dir_merge_named scripts/
 
 # Stream
-#stream:
+# stream:
 
 # Track the sun
 sun:
@@ -163,6 +157,9 @@ recorder: !include log/recorder.yaml
 # Discover DHCP requests for supported devices and services.
 dhcp:
 
+# Auto detection is based on the system routing next hop for the mDNS broadcast address
+network:
+
 # Simple Service Discovery Protocol (SSDP)
 ssdp:
 
@@ -172,6 +169,16 @@ ssdp:
 # Zero-configuration networking (zeroconf)
 zeroconf:
 
+######################################################################
+# Voice Interface
+######################################################################
+
+# Assist pipeline
+# assist_pipeline:
+
+# Allows you to issue voice commands from the frontend in enabled browsers
+# conversation:
+
 ######################################################################
 # Additional Components
 ######################################################################
@@ -182,9 +189,6 @@ binary_sensor: !include_dir_merge_list binary_sensor/
 # Covers
 cover: !include_dir_merge_list cover/
 
-# Allows you to issue voice commands from the frontend in enabled browsers
-#conversation:
-
 # Device Tracker
 device_tracker: !include_dir_merge_list device_tracker/
 
@@ -212,6 +216,9 @@ utility_meter: !include_dir_merge_named utility_meter/
 # Text to speech
 tts: !include components/tts.yaml
 
+# Templates
+template: !include_dir_merge_list template/
+
 # Wake on Lan
 wake_on_lan:
 
diff --git a/scripts/speech_engine.yaml b/scripts/speech_engine.yaml
index f94b5863..f9893928 100644
--- a/scripts/speech_engine.yaml
+++ b/scripts/speech_engine.yaml
@@ -100,7 +100,7 @@ speech_engine:
       data_template:
         media_player: "{{ media_player }}"
         volume_level: "{{ volume_level }}"
-        message: !include ../templates/speech_message.yaml
+        message: !include ../template_messages/speech.yaml
 
 ######################################################################
 # Script: Speech Status
diff --git a/templates/speech_message.yaml b/template_messages/speech.yaml
similarity index 100%
rename from templates/speech_message.yaml
rename to template_messages/speech.yaml
diff --git a/templates/welcome_message.yaml b/template_messages/welcome.yaml
similarity index 100%
rename from templates/welcome_message.yaml
rename to template_messages/welcome.yaml
-- 
2.47.3