From d8a34d5442988e104b0fff9b42f4bb3566753df1 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Mon, 2 Jan 2023 13:47:00 -0600 Subject: refactor(nvim): clean up neodev config --- nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua | 15 ++++++++++----- nvim/.config/nvim/lua/tobyvin/plugins/noice.lua | 12 +----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua index e7d3d39..bc9eaaa 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua @@ -1,10 +1,8 @@ local M = { "folke/neodev.nvim", -} - -function M.config() - require("neodev").setup({ + config = { experimental = { + -- much faster, but needs a nightly built of lua-language-server pathStrict = true, }, override = function(root_dir, library) @@ -13,7 +11,14 @@ function M.config() library.plugins = true end end, - }) + lspconfig = false, + }, +} + +function M.init() + require("tobyvin.lsp.configs").sumneko_lua.before_init = function() + require("neodev.lsp").before_init() + end end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua b/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua index 5dee123..2a2c170 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua @@ -125,7 +125,7 @@ function M.init() require("noice").cmd("errors") end) - -- TODO: figure out why setting `remap = true` failes to call the `zz` mapping + -- TODO: figure out why setting `remap = true` fails to call the `zz` mapping vim.keymap.set("n", "", function() if not require("noice.lsp").scroll(4) then return "zz" @@ -137,16 +137,6 @@ function M.init() return "zz" end end, { desc = "down half page and center", expr = true }) - - -- NOTE: copied from folke's config, not confident it's necessary - vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function(event) - vim.schedule(function() - require("noice.text.markdown").keys(event.buf) - end) - end, - }) end return M -- cgit v1.2.3-70-g09d2