Harmonize and avoid vim conflicts

keybindings.json

@@ -1,10 +1,4 @@
 [
-  // Vim
-  {
-    "key": "ctrl+i",
-    "command": "extension.vim_ctrl+i",
-    "when": "editorTextFocus && vim.active && vim.use<C-i> && !inDebugRepl"
-  },
   // Terminals
   {
     "key": "cmd+t",
@@ -372,11 +366,6 @@
     "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",

settings.json

@@ -127,7 +127,8 @@
   ],
   "vim.leader": ",",
   "vim.handleKeys": {
-    "<C-a>": false,
+    "<C-o>": false,
+    "<C-i>": false,
     "<C-w>": false,
     "<C-f>": false,
     "<C-k>": false,