diff --git a/.editorconfig b/.editorconfig
index d3761625..9348dd3d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@ root = true
 indent_style = space
 indent_size = 4
 charset = utf-8
-insert_final_newline = false
+insert_final_newline = true
 
 [*.rs]
 max_line_length = 100
diff --git a/.gitignore b/.gitignore
index 32b8e6f3..6fe72ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,6 @@
 
 tags
 
-/.vscode/
-
 # Ignore generated resources
 *.1
 /misc/_ncspot
diff --git a/.vscode/.gitignore b/.vscode/.gitignore
new file mode 100644
index 00000000..29e3aae9
--- /dev/null
+++ b/.vscode/.gitignore
@@ -0,0 +1,3 @@
+/*
+!/.gitignore
+!/extensions.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..f47a55ac
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "editorconfig.editorconfig"
+    ]
+}