diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000000..9c3727aef8e
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,5 @@
+;;; Directory Local Variables            -*- no-byte-compile: t -*-
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil . ((c-basic-offset . 4)
+	 (c-default-style . "k&r"))))
diff --git a/.gitignore b/.gitignore
index ea13b9f1789..3cbe312ed07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@
 __pycache__
 startup_stm32f10x_md_gcc.s
 .vagrant/
-.vscode/
+#.vscode/
 cov-int*
 /build/
 /obj/
@@ -31,3 +31,4 @@ README.pdf
 
 # local changes only
 make/local.mk
+launch.json
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 00000000000..547d37812cb
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,9 @@
+filetype on
+filetype indent on
+
+set expandtab
+set bs=2
+set sw=4
+set ts=4
+
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..2cece3ee127
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    "files.associations": {
+        "chrono": "c",
+        "cmath": "c",
+        "ranges": "c"
+    },
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true,
+    "editor.detectIndentation": false,
+    "editor.expandTabs": true,
+    "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4,  BreakBeforeBraces: Mozilla }"
+}