diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..2f1eafd3c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = space
+indent_size = 4
+
+[*.{bash,sh}]
+indent_style = space
+indent_size = 4
+
+[*.{yaml,yml}]
+indent_size = 2
diff --git a/.envrc b/.envrc
deleted file mode 100644
index 6762e217e..000000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-export KUBECONFIG=$(expand_path ./kubeconfig)
\ No newline at end of file