diff --git a/.editorconfig b/.editorconfig
index 7b816442..2c42e458 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,41 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.patch]
+trim_trailing_whitespace = false
+
 [*.md]
-tab_width = 2
+tab_width = 4
 indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+# Custom Armbian formatting for bash sources and configuration
+[*.{sh,inc,conf,eos,wip,tvb,csc}]
+indent_size = 4
+shell_variant = bash
+binary_next_line = false
+switch_case_indent = true
+space_redirects = true
+keep_padding = false
+function_next_line = false
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
+
+
+