Aligned configuration.yaml with default_config

diff --git a/configuration.yaml b/configuration.yaml
index 9bdcb8aa4b0fd069a1bc31363e4a2f1266685161..dd9f368c61875103d226c93253ed622e72801b55 100644 (file)
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -22,16 +22,6 @@ homeassistant:
   # Packages:
   packages: !include_dir_named packages/
 
-# Enables the frontend
-frontend:
-  themes: !include_dir_merge_named themes
-
-# Enables configuration UI
-config:
-
-# Lovelace UI Mode (moved to UI)
-#lovelace: !include lovelace.yaml
-
 # Uncomment this if you are using SSL/TLS, running in Docker container, etc.
 http:
    # ssl_certificate: /config/certs/fullchain.pem
@@ -45,48 +35,90 @@ http:
    ip_ban_enabled: True
    login_attempts_threshold: 3
 
-# Checks for available updates
-# Note: This component will send some information about your system to
-# the developers to assist with development of Home Assistant.
-# For more information, please see:
-# https://home-assistant.io/blog/2016/10/25/explaining-the-updater/
-updater:
-  # Optional, allows Home Assistant developers to focus on popular components.
-  # include_used_components: true
+######################################################################
+# Main Elements
+######################################################################
+
+# Automations
+automation: !include_dir_merge_list automations/
+
+# Home Assistant Cloud
+# cloud:
+
+# Enables configuration UI
+config:
+
+# counter
+#counter:
+
+# Energy
+energy:
+
+# Enables the frontend
+frontend:
+  themes: !include_dir_merge_named themes
+
+# Images
+image:
+
+# Inputs
+input_boolean: !include_dir_merge_named input_boolean/
+input_datetime: !include_dir_merge_named input_datetime/
+#input_number: !include_dir_merge_list input_number/
+#input_select: !include_dir_merge_list input_select/
+input_text: !include_dir_merge_named input_text/
 
 # Enables a map showing the location of tracked devices
 map:
 
+# Media Source
+#media_source:
+
+# Mobile App Support
+mobile_app:
+
+# My Home Assistant
+my:
+
+# Person
+person:
+
+# Scene
+#scene: !include_dir_merge_list scenes.yaml
+
+# Scripts
+script: !include_dir_merge_named scripts/
+
+# Stream
+#stream:
+
 # Track the sun
 sun:
 
 # Allow diagnosing system problems
 system_health:
 
-# Cloud
-# cloud:
+# Tags
+tag:
 
-# Mobile App
-mobile_app:
+# Timer
+timer:
 
-# Text to speech
-tts: !include components/tts.yaml
+# Checks for available updates
+# Note: This component will send some information about your system to
+# the developers to assist with development of Home Assistant.
+# For more information, please see:
+# https://home-assistant.io/blog/2016/10/25/explaining-the-updater/
+updater:
+  # Optional, allows Home Assistant developers to focus on popular components.
+  # include_used_components: true
+
+# Webhooks
+webhook:
 
 # Zones
 zone: !include_dir_list zone/
 
-# Group
-group: !include_dir_merge_named groups/
-
-# Automations
-automation: !include_dir_merge_list automations/
-
-# Scripts
-script: !include_dir_merge_named scripts/
-
-# Scene
-#scene: !include_dir_merge_list scenes.yaml
-
 ######################################################################
 # Logs
 ######################################################################
@@ -103,33 +135,6 @@ logger: !include log/logger.yaml
 # Record Management
 recorder: !include log/recorder.yaml
 
-######################################################################
-# Main Elements
-######################################################################
-
-# Covers
-cover: !include_dir_merge_list cover/
-
-# Inputs
-input_boolean: !include_dir_merge_named input_boolean/
-input_datetime: !include_dir_merge_named input_datetime/
-#input_number: !include_dir_merge_list input_number/
-#input_select: !include_dir_merge_list input_select/
-input_text: !include_dir_merge_named input_text/
-
-# Lights
-light: !include_dir_merge_list light/
-
-# Sensors
-sensor: !include_dir_merge_list sensor/
-binary_sensor: !include_dir_merge_list binary_sensor/
-
-# Switches
-#switch: !include_dir_merge_list switch/
-
-# Utility Meter
-utility_meter: !include_dir_merge_named utility_meter/
-
 ######################################################################
 # Discovery Protocols
 ######################################################################
@@ -150,18 +155,42 @@ zeroconf:
 # Additional Components
 ######################################################################
 
+# Binary Sensors
+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/
 
+# Group
+group: !include_dir_merge_named groups/
+
+# Lights
+light: !include_dir_merge_list light/
+
 # Notification
 notify: !include_dir_merge_list notify/
 
+# Sensors
+sensor: !include_dir_merge_list sensor/
+
 # Shell commands
 shell_command: !include_dir_merge_named shell_command/
 
+# Switches
+#switch: !include_dir_merge_list switch/
+
+# Utility Meter
+utility_meter: !include_dir_merge_named utility_meter/
+
+# Text to speech
+tts: !include components/tts.yaml
+
 # Wake on Lan
 wake_on_lan: