diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..1d74abd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,30 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.xml]
+indent_style = space
+indent_size = 4
+
+[*.neon]
+indent_style = tab
+indent_size = 4
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 4
+
+[composer.json]
+indent_style = space
+indent_size = 4
+
+[.phive/trust-gpg-keys.txt]
+insert_final_newline = false
diff --git a/.gitattributes b/.gitattributes
index 07764a7..07a9136 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-* text eol=lf
\ No newline at end of file
+* text eol=lf
+*.neon linguist-language=YAML