From cbdd1820f45fc28ee8b5d8d120bb001ca490e456 Mon Sep 17 00:00:00 2001 From: Johannes Knopp Date: Fri, 24 Jan 2025 14:32:35 +0100 Subject: [PATCH] add variable renaming to lsp --- nvim/lazy-lock.json | 16 ++++++++-------- nvim/lua/config/plugins/lsp/lspconfig.lua | 9 +++++---- zsh/.zshrc | 4 ++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 9502fa3..b44e8b0 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -18,20 +18,20 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "monokai-nightasty.nvim": { "branch": "main", "commit": "2e9ba900c249383abfc9e51ede312b27012737b0" }, + "monokai-nightasty.nvim": { "branch": "main", "commit": "78137f1ab7b42fc41a1ace10674889bc0aa9a28a" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "none-ls-extras.nvim": { "branch": "main", "commit": "6557f20e631d2e9b2a9fd27a5c045d701a3a292c" }, - "none-ls.nvim": { "branch": "main", "commit": "eec6019d95353f1706bff07ab4698354d09fe062" }, - "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, + "none-ls.nvim": { "branch": "main", "commit": "cc810f70852bd37334fad658372a8cfedd1da4e8" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" }, + "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" }, - "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, + "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, + "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, diff --git a/nvim/lua/config/plugins/lsp/lspconfig.lua b/nvim/lua/config/plugins/lsp/lspconfig.lua index ea2a2be..7d83d03 100644 --- a/nvim/lua/config/plugins/lsp/lspconfig.lua +++ b/nvim/lua/config/plugins/lsp/lspconfig.lua @@ -21,6 +21,7 @@ return { return { desc = desc, buffer = ev.buf, silent = true } end + keymap.set('n', 'gr', vim.lsp.buf.rename, opts('Rename')) keymap.set('n', 'K', vim.lsp.buf.hover, opts('Show documentation')) keymap.set('n', 'gR', 'Telescope lsp_references', opts('Show LSP references')) keymap.set('n', 'gD', vim.lsp.buf.declaration, opts('Go to declaration')) @@ -81,12 +82,12 @@ return { ['ts_ls'] = function() lspconfig['ts_ls'].setup({ capabilities = capabilities, - -- cmd = { "typescript-language-server", "--stdio" }, + cmd = { "typescript-language-server", "--stdio" }, init_options = { hostInfo = "neovim", - prferences = { - includePackagesJsonAutoImports = "on", - } + -- preferences = { + -- includePackagesJsonAutoImports = "on", + -- } } }) end, diff --git a/zsh/.zshrc b/zsh/.zshrc index 880b612..ad17553 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -111,3 +111,7 @@ source ~/dotfiles/zsh/tools.zsh + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion