From c9075e6d7201d936f1b388259372c45a3dd8d6b6 Mon Sep 17 00:00:00 2001 From: Andy Teijelo Date: Tue, 7 Mar 2023 00:19:10 -0500 Subject: [PATCH] find files, sumneko deprecation, plugin updates --- lua/user/keymaps.lua | 3 ++- lua/user/lsp/handlers.lua | 2 +- lua/user/lsp/mason.lua | 3 ++- lua/user/plugins.lua | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 54e2066..b2bdef8 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -73,7 +73,8 @@ keymap("x", "-", "/", opts) keymap("n", "e", ":NvimTreeToggle", opts) -- Telescope -keymap("n", "ff", ":Telescope find_files", opts) +keymap("n", "fa", ":Telescope find_files", opts) +keymap("n", "ff", ":Telescope git_files", opts) keymap("n", "ft", ":Telescope live_grep", opts) keymap("n", "fp", ":Telescope projects", opts) keymap("n", "fb", ":Telescope buffers", opts) diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index 66ebb31..df4bcdf 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -83,7 +83,7 @@ M.on_attach = function(client, bufnr) client.server_capabilities.documentFormattingProvider = false end - if client.name == "sumneko_lua" then + if client.name == "lua_ls" then client.server_capabilities.documentFormattingProvider = false end diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua index e0689c4..138db95 100644 --- a/lua/user/lsp/mason.lua +++ b/lua/user/lsp/mason.lua @@ -1,5 +1,5 @@ local servers = { - "sumneko_lua", + "lua_ls", "cssls", "html", "tsserver", @@ -10,6 +10,7 @@ local servers = { "rust_analyzer", "gopls", "clangd", + "taplo" } local settings = { diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index dea518e..d84811f 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -79,11 +79,11 @@ return packer.startup(function(use) -- LSP -- use { "williamboman/nvim-lsp-installer", commit = "e9f13d7acaa60aff91c58b923002228668c8c9e6" } -- simple to use language server installer - use({ "neovim/nvim-lspconfig", commit = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" }) -- enable LSP - use({ "williamboman/mason.nvim", commit = "c2002d7a6b5a72ba02388548cfaf420b864fbc12" }) - use({ "williamboman/mason-lspconfig.nvim", commit = "0051870dd728f4988110a1b2d47f4a4510213e31" }) - use({ "jose-elias-alvarez/null-ls.nvim", commit = "c0c19f32b614b3921e17886c541c13a72748d450" }) -- for formatters and linters - use({ "RRethy/vim-illuminate", commit = "a2e8476af3f3e993bb0d6477438aad3096512e42" }) + use({ "neovim/nvim-lspconfig" }) -- enable LSP + use({ "williamboman/mason.nvim" }) + use({ "williamboman/mason-lspconfig.nvim" }) + use({ "jose-elias-alvarez/null-ls.nvim" }) -- for formatters and linters + use({ "RRethy/vim-illuminate" }) -- Telescope use({ "nvim-telescope/telescope.nvim", commit = "76ea9a898d3307244dce3573392dcf2cc38f340f" })