diff --git a/.editorconfig b/.editorconfig
index 87496c115e..50a87fd839 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,14 @@
 root = true
 
-[*.{c,cpp,cc,h,hpp}]
+[*]
+insert_final_newline = false
+
+[{*.{c,cpp,cc,h,hpp},CMakeLists.txt,Kconfig}]
 indent_style = tab
 tab_width = 8
+# Not in the official standard, but supported by many editors
 max_line_length = 120
+
+[*.yaml]
+indent_style = space
+indent_size = 2