diff options
| -rw-r--r-- | .code-vimrc | 2 | ||||
| -rw-r--r-- | .config/Code/User/keybindings.json | 19 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 10 |
3 files changed, 23 insertions, 8 deletions
diff --git a/.code-vimrc b/.code-vimrc index e88a240..eb089c1 100644 --- a/.code-vimrc +++ b/.code-vimrc @@ -2,8 +2,6 @@ nnoremap <C-d> <C-d>zz nnoremap <C-u> <C-u>zz nnoremap n nzzzv nnoremap N Nzzzv -nnoremap <Leader>o :jumps<CR> vnoremap <C-c> "+y vmap <C-x> "+x map <C-p> "+p -map <Leader>p "+P diff --git a/.config/Code/User/keybindings.json b/.config/Code/User/keybindings.json index 020478d..147e74a 100644 --- a/.config/Code/User/keybindings.json +++ b/.config/Code/User/keybindings.json @@ -338,6 +338,23 @@ "command": "editor.action.formatDocument", "when": "vim.active && vim.mode == 'Normal'" }, + // .code-vimrc leader replicas + { + "key": "\\ o", + "command": "vim.remap", + "args": { + "commands": [{"command": ":jumps"}] + }, + "when": "vim.active && vim.mode == 'Normal'" + }, + { + "key": "\\ p", + "command": "vim.remap", + "args": { + "after": ["\"", "+", "P"] + }, + "when": "vim.active && vim.mode == 'Normal'" + }, // ai inline completion (mirrors my neovim minuet keymaps) { "key": "alt+a", @@ -356,7 +373,7 @@ }, // copilot inline chat (mirrors my neovim opencode keymaps) { - "key": "\\ o", + "key": "\\ i", "command": "inlineChat.start", "when": "vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatPossible && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasNotebookAgent && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasNotebookAgent && inlineChatPossible && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasNotebookInline && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasNotebookInline && inlineChatPossible && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatHasNotebookAgent && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatHasNotebookAgent && inlineChatPossible && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatHasNotebookInline && inlineChatPossible && !config.inlineChat.askInChat && !editorReadonly && !editorSimpleInput && activeEditor == 'workbench.editor.notebook' || vim.active && vim.mode =~ /^(Normal|Visual|VisualLine|VisualBlock)$/ && editorFocus && inlineChatHasEditsAgent && inlineChatHasNotebookInline && inlineChatPossible && !editorReadonly && !editorSimpleInput && !inlineChatFileBelongsToChat && activeEditor == 'workbench.editor.notebook'" } diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 066a6f8..7b3596e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -114,8 +114,8 @@ keymap("n", "<S-A-b>h", ":NERDTreeToggle<CR>", { noremap = true }) keymap("n", "<S-A-b><S-A-h>", ":NERDTreeToggle<CR>", { noremap = true }) keymap("n", "<A-n>", ":NERDTreeToggle<CR>", { noremap = true }) keymap("n", "<S-A-n>", ":NERDTree<CR>", { noremap = true }) -keymap("n", "<S-A-j>", "<C-W>w", { noremap = true }) -keymap("n", "<S-A-k>", "<C-W>W", { noremap = true }) +keymap({ "n", "t" }, "<S-A-j>", "<C-\\><C-n><C-W>w", { noremap = true }) +keymap({ "n", "t" }, "<S-A-k>", "<C-\\><C-n><C-W>W", { noremap = true }) keymap({ "n", "t" }, "<S-A-b>j", function() toggle_terminal() end, { noremap = true }) keymap({ "n", "t" }, "<S-A-b><S-A-j>", function() toggle_terminal() end, { noremap = true }) keymap("n", "<leader>sc", ":set spell!<CR>", { noremap = true, silent = true }) @@ -454,7 +454,7 @@ end -- opencode integration local ok_oc, opencode = pcall(require, "opencode") if ok_oc then - keymap({ "n", "x" }, "<leader>oa", function() opencode.ask("@this: ") end, { desc = "opencode: ask" }) - keymap({ "n", "x" }, "<leader>os", function() opencode.select() end, { desc = "opencode: select" }) - keymap({ "n", "x" }, "<leader>o", function() return opencode.operator("@this ") end, { desc = "opencode: operator", expr = true }) + keymap({ "n", "x" }, "<leader>i", function() opencode.ask("@this: ") end, { desc = "opencode: ask" }) + keymap({ "n", "x" }, "<leader>is", function() opencode.select() end, { desc = "opencode: select" }) + keymap({ "n", "x" }, "<leader>io", function() return opencode.operator("@this ") end, { desc = "opencode: operator", expr = true }) end |