From 3d13e614a0fccd439af84020d620c19789cd7cb0 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 22 Jul 2021 22:59:33 +0200 Subject: [PATCH 1/5] feat: lazyredraw the windows' content e.g. when applying a macro on several lines --- .config/nvim/lua/settings.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 18eefbf..0740eae 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -19,6 +19,7 @@ opt.wildoptions = "pum" g.loaded_netrw = 1 -- disable netrw -- editor +opt.lazyredraw = true opt.splitright = true opt.splitbelow = true opt.scrolloff = 4 From e159cad0ec2bcc4d9ed0e0fe922dc158083bff37 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 22 Jul 2021 23:00:55 +0200 Subject: [PATCH 2/5] format: don't create tables for one single string --- .config/nvim/lua/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index e1a02d4..3b5237b 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -35,7 +35,7 @@ return require("packer").startup(function() "nvim-telescope/telescope.nvim", requires = { "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}, opt = true, - cmd = {"Telescope"} + cmd = "Telescope" } -- LSP @@ -48,7 +48,7 @@ return require("packer").startup(function() use { "norcalli/nvim-colorizer.lua", opt = true, - cmd = {"ColorizerToggle"} + cmd = "ColorizerToggle" } end) From 2b9ba03eaf6864f7fb841288f109cec4433a9a31 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 22 Jul 2021 23:03:21 +0200 Subject: [PATCH 3/5] refactor: configure LSP in ~/.config/nvim/lua/lsp -> moved from ~/.config/nvim/ .../nvim/lua/lsp/init.lua now has a setup() function !!! nvim-lspconfig is now lazy-loaded -> packer checks filetype (see .../nvim/plugins.lua) --- .config/nvim/init.lua | 7 ------- .config/nvim/lua/lsp/init.lua | 10 ++++++++++ .config/nvim/lua/plugins.lua | 7 ++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d913130..9199b9d 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -12,13 +12,6 @@ require("statusline") -- ./lua/statusline.lua require("polyjuice") -- ~/.local/src/polyjuice/lua/polyjuice.lua --- LSP -require("lsp") -- ./lua/lsp/init.lua -require("lsp.c") -- ./lua/lsp/c.lua -require("lsp.lua") -- ./lua/lsp/lua.lua -require("lsp.python") -- ./lua/lsp/python.lua -require("lsp.tex") -- ./lua/lsp/python.lua - -- auto complete require("plugin.compe") -- ./lua/plugin/compe.lua diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua index 32d39a7..c7e5d03 100644 --- a/.config/nvim/lua/lsp/init.lua +++ b/.config/nvim/lua/lsp/init.lua @@ -3,6 +3,8 @@ -- License : GPLv3 -- Description : neovim lsp config file +local lsp = {} + vim.fn.sign_define( "LspDiagnosticsSignError", { @@ -63,3 +65,11 @@ vim.lsp.protocol.CompletionItemKind = { "  ", -- Operator "  ", -- TypeParameter } + +function lsp.setup() + local ft = vim.bo.filetype + if ft == "cpp" then ft = "c" end + require("lsp." .. ft) -- ./.lua +end + +return lsp diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 3b5237b..4c19d85 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -39,7 +39,12 @@ return require("packer").startup(function() } -- LSP - use "neovim/nvim-lspconfig" + use { + "neovim/nvim-lspconfig", + opt = true, + ft = { "c", "cpp", "lua", "python", "tex"}, + config = function() require("lsp").setup() end + } -- auto completion use "hrsh7th/nvim-compe" From c4aeb144cb09b81e62ee41018507fa8951666a06 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 22 Jul 2021 23:10:38 +0200 Subject: [PATCH 4/5] cleanup: remove unnecessary settings for nvim plugins no need for "opt = true" when using "cmd = ..." or "ft = ..." --- .config/nvim/lua/plugins.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 4c19d85..87c2352 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -34,14 +34,12 @@ return require("packer").startup(function() use { "nvim-telescope/telescope.nvim", requires = { "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}, - opt = true, cmd = "Telescope" } -- LSP use { "neovim/nvim-lspconfig", - opt = true, ft = { "c", "cpp", "lua", "python", "tex"}, config = function() require("lsp").setup() end } @@ -52,7 +50,6 @@ return require("packer").startup(function() -- display colors directly in editor use { "norcalli/nvim-colorizer.lua", - opt = true, cmd = "ColorizerToggle" } From d2f7335a1d86cad36c8d9b83aba89e9a6a25cf5e Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 22 Jul 2021 23:12:01 +0200 Subject: [PATCH 5/5] feat: update sumneko_lua --- .local/share/nvim/lsp/sumneko_lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/share/nvim/lsp/sumneko_lua b/.local/share/nvim/lsp/sumneko_lua index 9889dc0..8bd3d09 160000 --- a/.local/share/nvim/lsp/sumneko_lua +++ b/.local/share/nvim/lsp/sumneko_lua @@ -1 +1 @@ -Subproject commit 9889dc0d1c9673575ebbfa62f3d47d59d0ff8664 +Subproject commit 8bd3d0987af29c71f5e6bfa884936dc99aa58293