diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..fab77dc55
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# default configuration
+[*]
+charset = utf-8
+end_of_line = crlf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
diff --git a/.eslintrc b/.eslintrc
index f86594325..49399aae6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,8 @@
 {
   "extends": "@dabh/eslint-config-populist",
   "rules": {
-    "one-var": ["error", { var: "never", let: "never", const: "never" }],
+    "one-var": ["error", { "var": "never", "let": "never", "const": "never" }],
+    "linebreak-style": ["error", "windows"],
     "strict": 0
   },
   "parserOptions": {