X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.editorconfig;h=60827f04baf170b87e6b0d8f574d6c1926087765;hb=7ec583e5efb276ce90a40a1df985de7d0d0b8f46;hp=82837f7f132aa09a12ed3f9fdf4b01ec88d13742;hpb=6169cd52ba031f56268a32c636e9af35941e27a2;p=qmk_firmware.git

diff --git a/.editorconfig b/.editorconfig
index 82837f7f1..60827f04b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,10 +5,9 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 # We recommend you to keep these unchanged
-end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
@@ -16,3 +15,28 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 indent_size = 4
+
+[{qmk,*.py}]
+charset = utf-8
+max_line_length = 200
+
+# Make these match what we have in .gitattributes
+[*.mk]
+end_of_line = lf
+indent_style = tab
+
+[Makefile]
+end_of_line = lf
+indent_style = tab
+
+[*.sh]
+end_of_line = lf
+
+# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
+
+
+# We don't have gitattributes properly for these
+# So if the user have for example core.autocrlf set to true
+# the line endings would be wrong.
+[lib/**]
+end_of_line = unset