diff --git a/.gitignore b/.gitignore
index fcc672225a77..799fb54def9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@ util/Win_Check_Output.txt
 .vscode/tasks.json
 .vscode/last.sql
 .vscode/temp.sql
-.vscode/settings.json
 .stfolder
 .tags
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000000..ba5b56aa4022
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,17 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    // Unofficially, QMK uses spaces for indentation
+    "editor.insertSpaces": true,
+    // Configure glob patterns for excluding files and folders.
+    "files.exclude": {
+        "**/.build": true,
+        "**/*.hex": true
+    },
+    "files.associations": {
+        "*.h": "c",
+        "*.c": "c",
+        "*.cpp": "cpp",
+        "*.hpp": "cpp",
+        "xstddef": "c"
+    }
+}