From e7b351494fa0f0d4cbd719c4fee277f2449db4d2 Mon Sep 17 00:00:00 2001 From: Carlos Sousa Date: Fri, 20 Dec 2024 20:04:11 +0100 Subject: [PATCH] fix handling for vscode_ide with neovim --- config/nvim/init.lua | 2 +- config/nvim/lazy-lock.json | 2 +- config/nvim/lua/vscode_ide/init.lua | 1 + config/nvim/lua/vscode_ide/keymaps.lua | 51 ++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 config/nvim/lua/vscode_ide/init.lua create mode 100644 config/nvim/lua/vscode_ide/keymaps.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 4f3377a..64ad913 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,6 +1,6 @@ require("leaders") if vim.g.vscode then - require('vscode') + require('vscode_ide') else require('editor_settings') require('user') diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 353fd07..a3eb95f 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, - "nvim-treesitter-context": { "branch": "master", "commit": "8fd989b6b457a448606b4a2e51f9161700f609a7" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "rose-pine": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, diff --git a/config/nvim/lua/vscode_ide/init.lua b/config/nvim/lua/vscode_ide/init.lua new file mode 100644 index 0000000..4d6092a --- /dev/null +++ b/config/nvim/lua/vscode_ide/init.lua @@ -0,0 +1 @@ +require("vscode_ide.keymaps") diff --git a/config/nvim/lua/vscode_ide/keymaps.lua b/config/nvim/lua/vscode_ide/keymaps.lua new file mode 100644 index 0000000..47f2a57 --- /dev/null +++ b/config/nvim/lua/vscode_ide/keymaps.lua @@ -0,0 +1,51 @@ +local keymap = vim.keymap.set +local opts = { noremap = true, silent = true } + +-- remap leader key +keymap("n", "", "", opts) + +-- yank to system clipboard +keymap({"n", "v"}, "y", '"+y', opts) + +-- paste from system clipboard +keymap({"n", "v"}, "p", '"+p', opts) + +-- better indent handling +keymap("v", "<", "", ">gv", opts) + +-- move text up and down +keymap("v", "J", ":m .+1==", opts) +keymap("v", "K", ":m .-2==", opts) +keymap("x", "J", ":move '>+1gv-gv", opts) +keymap("x", "K", ":move '<-2gv-gv", opts) + +-- call vscode commands from neovim +keymap({"n", "v"}, "ff", "lua require('vscode').action('workbench.action.quickOpen')") + +-- general keymaps +-- keymap({"n", "v"}, "t", "lua require('vscode').action('workbench.action.terminal.toggleTerminal')") +-- keymap({"n", "v"}, "d", "lua require('vscode').action('editor.action.showHover')") +-- keymap({"n", "v"}, "a", "lua require('vscode').action('editor.action.quickFix')") +-- keymap({"n", "v"}, "cp", "lua require('vscode').action('workbench.action.showCommands')") +-- keymap({"n", "v"}, "pr", "lua require('vscode').action('code-runner.run')") +-- keymap({"n", "v"}, "fd", "lua require('vscode').action('editor.action.formatDocument')") +-- +-- -- harpoon keymaps +-- keymap({"n", "v"}, "ha", "lua require('vscode').action('vscode-harpoon.addEditor')") +-- keymap({"n", "v"}, "ho", "lua require('vscode').action('vscode-harpoon.editorQuickPick')") +-- keymap({"n", "v"}, "he", "lua require('vscode').action('vscode-harpoon.editEditors')") +-- keymap({"n", "v"}, "h1", "lua require('vscode').action('vscode-harpoon.gotoEditor1')") +-- keymap({"n", "v"}, "h2", "lua require('vscode').action('vscode-harpoon.gotoEditor2')") +-- keymap({"n", "v"}, "h3", "lua require('vscode').action('vscode-harpoon.gotoEditor3')") +-- keymap({"n", "v"}, "h4", "lua require('vscode').action('vscode-harpoon.gotoEditor4')") +-- keymap({"n", "v"}, "h5", "lua require('vscode').action('vscode-harpoon.gotoEditor5')") +-- keymap({"n", "v"}, "h6", "lua require('vscode').action('vscode-harpoon.gotoEditor6')") +-- keymap({"n", "v"}, "h7", "lua require('vscode').action('vscode-harpoon.gotoEditor7')") +-- keymap({"n", "v"}, "h8", "lua require('vscode').action('vscode-harpoon.gotoEditor8')") +-- keymap({"n", "v"}, "h9", "lua require('vscode').action('vscode-harpoon.gotoEditor9')") +-- +-- -- project manager keymaps +-- keymap({"n", "v"}, "pa", "lua require('vscode').action('projectManager.saveProject')") +-- keymap({"n", "v"}, "po", "lua require('vscode').action('projectManager.listProjectsNewWindow')") +-- keymap({"n", "v"}, "pe", "lua require('vscode').action('projectManager.editProjects')")