diff --git a/files/vscode-settings.json b/files/vscode-settings.json
index 906b35c..5dd48ab 100644
--- a/files/vscode-settings.json
+++ b/files/vscode-settings.json
@@ -1,11 +1,16 @@
 {
     "terminal.integrated.fontFamily": "Hack",
+    "terminal.integrated.scrollback": 1000000,
     // "C_Cpp.clang_format_style": "{BasedOnStyle: LLVM, Language: Cpp, IndentWidth: 2, ColumnLimit: 110, BreakBeforeBraces: Attach, PointerAlignment: Left, AccessModifierOffset: -2, Cpp11BracedListStyle: true, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, AlignEscapedNewlines: Left, AlignTrailingComments: true, IndentWrappedFunctionNames: false, AllowShortFunctionsOnASingleLine: Inline, SpacesBeforeTrailingComments: 2, FixNamespaceComments: true, ReflowComments: false, SortIncludes: false, SortUsingDeclarations: false}",
     "C_Cpp.clang_format_style": "file",
+    "C_Cpp.clang_format_sortIncludes": true,
     "C_Cpp.clang_format_fallbackStyle": "{BasedOnStyle: LLVM, Language: Cpp, IndentWidth: 2, ColumnLimit: 110, BreakBeforeBraces: Attach, PointerAlignment: Left, AccessModifierOffset: -2, Cpp11BracedListStyle: true, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, AlignEscapedNewlines: Left, AlignTrailingComments: true, IndentWrappedFunctionNames: false, AllowShortFunctionsOnASingleLine: Inline, SpacesBeforeTrailingComments: 2, FixNamespaceComments: true, ReflowComments: false, SortIncludes: false, SortUsingDeclarations: false}",
     "C_Cpp.clang_format_path": "/usr/local/bin/clang-format",
     "C_Cpp.intelliSenseEngine": "Default",
     "cmake.statusbar.visibility": "icon",
+    "cmake.generator": "Ninja",
+    "cmake.configureOnOpen": true,
+    "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
     "git-graph.showStatusBarItem": false,
     "editor.tabSize": 2,
     "editor.renderWhitespace": "boundary",
@@ -13,6 +18,7 @@
     "editor.formatOnSave": true,
     "editor.formatOnType": false,
     "editor.multiCursorModifier": "ctrlCmd",
+    "diffEditor.ignoreTrimWhitespace": false,
     "[json]": {
         "editor.tabSize": 4
     },