From 24ed9f309cc658a132b65832406cc4a22a7e84f6 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Fri, 15 Nov 2019 15:21:12 +0100
Subject: [PATCH] Merge another VS Code config.

---
 .../vscode/.config/Code/User/settings.json    | 145 +++++++++++-------
 1 file changed, 91 insertions(+), 54 deletions(-)

diff --git a/home-profiles/vscode/.config/Code/User/settings.json b/home-profiles/vscode/.config/Code/User/settings.json
index f07af18..f067855 100644
--- a/home-profiles/vscode/.config/Code/User/settings.json
+++ b/home-profiles/vscode/.config/Code/User/settings.json
@@ -1,58 +1,95 @@
 {
-    "window.zoomLevel": 0,
-    "explorer.openEditors.visible": 0,
-
-    "workbench.startupEditor": "none",
-    "workbench.settings.editor": "json",
-    "workbench.settings.useSplitJSON": true,
-    "workbench.colorTheme": "Monokai Dimmed",
-    "workbench.iconTheme": "vscode-icons",
-    "update.mode": "none",
-    "window.menuBarVisibility": "toggle",
-    "explorer.confirmDelete": false,
-    "vsicons.dontShowNewVersionMessage": true,
-
-    "editor.cursorSmoothCaretAnimation": true,
-    "editor.fontSize": 14,
-    "editor.fontFamily": "Fira Code Light",
-    "editor.fontLigatures": true,
-    "search.smartCase": true,
-
-    "editor.tabSize": 2,
-    "editor.smoothScrolling": true,
-
-    "latex-workshop.latex.autoBuild.onSave.enabled": false,
-    "latex-workshop.view.pdf.viewer": "browser",
-    "latex-workshop.chktex.enabled": true,
-
-    "vim.disableExtension": false,
-    "vim.leader": "-",
-    "vim.sneak": true,
-    "vim.easymotion": true,
-    "vim.useSystemClipboard": true,
-    "vim.smartcase": true,
-    "vim.handleKeys": {
-        "<C-d>": false
-    },
-    "vim.insertModeKeyBindings": [
+  "window.zoomLevel": 0,
+  "explorer.openEditors.visible": 0,
+  
+  "workbench.startupEditor": "none",
+  "workbench.settings.editor": "json",
+  "workbench.settings.useSplitJSON": true,
+  "workbench.settings.enableNaturalLanguageSearch": false,
+  "workbench.colorTheme": "Monokai Dimmed",
+  "workbench.iconTheme": "vscode-icons",
+  "workbench.tree.renderIndentGuides": "always",
+  "update.mode": "none",
+  "window.menuBarVisibility": "toggle",
+  "explorer.confirmDelete": false,
+  "vsicons.dontShowNewVersionMessage": true,
+  
+  "breadcrumbs.enabled": true,
+  "zenMode.centerLayout": false,
+  
+  "files.trimTrailingWhitespace": true,
+  // colors
+  "editor.tokenColorCustomizations": {
+    "[Monokai Dimmed]": {
+      "textMateRules": [
         {
-            "before": ["f", "d"],
-            "after": ["<Esc>"]
+          "scope": "keyword.operator",
+          "settings": {
+            "foreground": "#F92672"
+          }
+        },
+        {
+          "scope": "entity.name.class, entity.name.type, entity.name.namespace, entity.name.scope-resolution",
+          "settings": {
+            "foreground": "#b6a08c"
+          }
         }
-    ],
-    "vim.highlightedyank.enable": true,
-    "vim.enableNeovim": false,
-    "editor.formatOnType": false,
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": false,
-
-    "terminal.integrated.shell.windows": "cmd.exe",
-    "terminal.integrated.shellArgs.windows": [
-        "/k", "%userprofile%\\cmder\\vendor\\init.bat"
-    ],
-    
-    // Windows:
-    // %userprofile% seems to have no effect, test again and then maybe report as bug
-    "terminal.external.windowsExec": "C:\\Users\\Jens\\cmder\\cmder.exe",
-    "powershell.powerShellExePath": "C:\\Program Files\\PowerShell\\6\\pwsh.exe",
+      ]
+    }
+  },
+  "workbench.colorCustomizations": {
+    "editorError.foreground": "#fc2457",
+  },
+  
+  "editor.cursorSmoothCaretAnimation": true,
+  "editor.fontSize": 14,
+  "editor.fontFamily": "Fira Code Light",
+  "editor.fontLigatures": true,
+  "search.smartCase": true,
+  
+  "editor.tabSize": 2,
+  "editor.smoothScrolling": true,
+  
+  "latex-workshop.latex.autoBuild.onSave.enabled": false,
+  "latex-workshop.view.pdf.viewer": "browser",
+  "latex-workshop.chktex.enabled": true,
+  
+  "vim.disableExtension": false,
+  "vim.leader": "-",
+  "vim.sneak": true,
+  "vim.surround": true,
+  "vim.easymotion": true,
+  "vim.useSystemClipboard": true,
+  "vim.smartcase": true,
+  "vim.handleKeys": {
+    "<C-d>": false
+  },
+  "vim.insertModeKeyBindings": [
+    {
+      "before": ["f", "d"],
+      "after": ["<Esc>"]
+    }
+  ],
+  "vim.visualModeKeyBindingsNonRecursive": [
+    {
+        "before": ["f", "d"],
+        "after": ["<Esc>"]
+    }
+  ],
+  "vim.highlightedyank.enable": true,
+  "vim.enableNeovim": false,
+  "editor.formatOnType": false,
+  "editor.formatOnPaste": false,
+  "editor.formatOnSave": false,
+  
+  "terminal.integrated.shell.windows": "cmd.exe",
+  "terminal.integrated.shellArgs.windows": [
+    "/k", "%userprofile%\\cmder\\vendor\\init.bat"
+  ],
+  
+  
+  // Windows:
+  // %userprofile% seems to have no effect, test again and then maybe report as bug
+  "terminal.external.windowsExec": "C:\\Users\\Jens\\cmder\\cmder.exe",
+  "powershell.powerShellExePath": "C:\\Program Files\\PowerShell\\6\\pwsh.exe",
 }
-- 
GitLab