From d5d4d19376034be4f154b3236b91b133e1417fad Mon Sep 17 00:00:00 2001
From: Wilfried OLLIVIER <wollivier@fdn.fr>
Date: Sat, 29 Oct 2022 16:29:08 +0200
Subject: [PATCH] Reorganize vscode configs

---
 keybindings.json | 25 +++++++++++++----------
 settings.json    | 53 ++++++++++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/keybindings.json b/keybindings.json
index dd817c5..130d8f5 100644
--- a/keybindings.json
+++ b/keybindings.json
@@ -106,6 +106,7 @@
     "command": "workbench.action.quickOpenSelectPrevious",
     "when": "inQuickOpen"
   },
+  // Editor closing
   {
     "key": "ctrl+q ctrl+q",
     "command": "workbench.action.closeEditorsInOtherGroups",
@@ -124,6 +125,7 @@
     "key": "ctrl+q ctrl+w",
     "command": "workbench.action.closeAllEditors"
   },
+  // Editor nav
   {
     "key": "meta+1",
     "command": "workbench.action.focusFirstEditorGroup"
@@ -193,21 +195,11 @@
     "key": "ctrl+,",
     "command": "workbench.action.toggleMaximizedPanel"
   },
+  // Spacecode
   {
     "key": "ctrl+space",
     "command": "vspacecode.space"
   },
-  // Misc resets with no rebind
-  {
-    "key": "ctrl+o",
-    "command": "-extension.vim_ctrl+o",
-    "when": "editorTextFocus && vim.active && vim.use<C-o> && !inDebugRepl"
-  },
-  {
-    "key": "shift+alt+[Period]",
-    "command": "-gitlens.gitCommands",
-    "when": "!gitlens:disabled && config.gitlens.keymap == 'alternate'"
-  },
   // Notifications
   {
     "key": "ctrl+y ;",
@@ -369,5 +361,16 @@
     "key": "shift+4",
     "command": "-magit.process-log",
     "when": "editorTextFocus && editorLangId == 'magit' && vim.mode =~ /^(?!SearchInProgressMode|CommandlineInProgress).*$/"
+  },
+  // Misc resets with no rebind
+  {
+    "key": "ctrl+o",
+    "command": "-extension.vim_ctrl+o",
+    "when": "editorTextFocus && vim.active && vim.use<C-o> && !inDebugRepl"
+  },
+  {
+    "key": "shift+alt+[Period]",
+    "command": "-gitlens.gitCommands",
+    "when": "!gitlens:disabled && config.gitlens.keymap == 'alternate'"
   }
 ]
diff --git a/settings.json b/settings.json
index f1fb903..1ae8d18 100644
--- a/settings.json
+++ b/settings.json
@@ -1,4 +1,5 @@
 {
+  // VIM
   "keyboard.dispatch": "keyCode",
   "vim.easymotion": true,
   "vim.incsearch": true,
@@ -135,6 +136,7 @@
     "<C-j>": false
   },
   "vim.statusBarColorControl": false,
+  // Editor
   "editor.fontFamily": "'JetBrainsMono Nerd Font', Monaco, 'Courier New', monospace",
   "editor.fontSize": 11,
   "editor.bracketPairColorization.enabled": true,
@@ -162,9 +164,6 @@
   "editor.lineNumbers": "on",
   "editor.wordSeparators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-",
   "editor.wordWrap": "off",
-  "terminal.integrated.enablePersistentSessions": false,
-  "terminal.integrated.fontFamily": "'MesloLGS NF'",
-  "terminal.integrated.fontSize": 11,
   "workbench.colorTheme": "Gruvbox Light Soft",
   "workbench.colorCustomizations": {
     "editorBracketHighlight.foreground1": "#d79921",
@@ -176,6 +175,11 @@
   },
   "workbench.iconTheme": "bearded-icons",
   "workbench.sideBar.location": "right",
+  // Terminal
+  "terminal.integrated.enablePersistentSessions": false,
+  "terminal.integrated.fontFamily": "'MesloLGS NF'",
+  "terminal.integrated.fontSize": 11,
+  // Git
   "redhat.telemetry.enabled": false,
   "gitlens.advanced.messages": {
     "suppressCommitHasNoPreviousCommitWarning": false,
@@ -188,41 +192,39 @@
   "gitlens.keymap": "alternate",
   "githubPullRequests.pullBranch": "never",
   "git.mergeEditor": false,
+  // LUA
   "Lua.telemetry.enable": false,
+  // Go
   "go.toolsManagement.autoUpdate": true,
   "go.formatTool": "goimports",
   "go.useLanguageServer": true,
   "go.lintTool": "golint",
+  // Ruby
   "solargraph.autoformat": true,
   "solargraph.commandPath": "solargraph",
-  "ruby.lint": {
-    "rubocop": true
-  },
-  "ruby.format": "rubocop",
-  "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.tabSize": 2,
-    "editor.insertSpaces": true
-  },
-  "[python]": {
-    "editor.tabSize": 4,
-    "editor.insertSpaces": true
-  },
   "[ruby]": {
     "editor.tabSize": 2,
     "editor.insertSpaces": true,
     "editor.defaultFormatter": "rebornix.ruby"
   },
+  // JS/TS
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.tabSize": 2,
+    "editor.insertSpaces": true
+  },
   "[javascript]": {
     "editor.tabSize": 2,
     "editor.insertSpaces": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[elixir]": {
-    "editor.tabSize": 2,
+  // Python
+  "[python]": {
+    "editor.tabSize": 4,
     "editor.insertSpaces": true
   },
-  "[crystal]": {
+  // Elixir / Erlang
+  "[elixir]": {
     "editor.tabSize": 2,
     "editor.insertSpaces": true
   },
@@ -230,18 +232,25 @@
     "editor.tabSize": 2,
     "editor.insertSpaces": true
   },
-  "[html]": {
-    "editor.tabSize": 4,
+  // Crystal
+  "[crystal]": {
+    "editor.tabSize": 2,
     "editor.insertSpaces": true
   },
+  // Rust
   "[rust]": {
     "editor.tabSize": 4,
     "editor.insertSpaces": true
   },
+  // Markup
   "[yaml]": {
     "editor.defaultFormatter": "redhat.vscode-yaml"
   },
+  "[html]": {
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true
+  },
   "emmet.includeLanguages": {
     "erb": "html"
-  },
+  }
 }