From 5228c81e6c0cdbc277d675583f6a5f574b69bc72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Mon, 17 Oct 2022 11:17:04 +0200 Subject: [PATCH] update neovim --- dot_config/nvim/lua/configs/lsp.lua | 14 +- dot_config/nvim/lua/configs/null-ls.lua | 46 +++--- dot_config/nvim/lua/configs/packages.lua | 193 ++++++++++++----------- 3 files changed, 129 insertions(+), 124 deletions(-) diff --git a/dot_config/nvim/lua/configs/lsp.lua b/dot_config/nvim/lua/configs/lsp.lua index 07624f2..c2cb040 100644 --- a/dot_config/nvim/lua/configs/lsp.lua +++ b/dot_config/nvim/lua/configs/lsp.lua @@ -41,7 +41,7 @@ local function on_attach(args) end function M.setup() - require("lua-dev").setup({}) + require("neodev").setup({}) vim.api.nvim_create_autocmd('LspAttach', { callback = on_attach @@ -49,6 +49,8 @@ function M.setup() local nvim_lsp = require('lspconfig') + local capabilities = require('cmp_nvim_lsp').default_capabilities() + -- Use a loop to conveniently both setup defined servers -- and map buffer local keybindings when the language server attaches local servers = { @@ -67,13 +69,13 @@ function M.setup() for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = M.on_attach, - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()), + capabilities = capabilities } end require('lspconfig').jsonls.setup { -- on_attach = M.on_attach, - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()), + capabilities = capabilities, settings = { validate = { enable = true }, json = { @@ -97,7 +99,7 @@ function M.setup() require 'lspconfig'.phpactor.setup { -- on_attach = M.on_attach, - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()), + capabilities = capabilities, root_dir = function(startpath) local u = require('lspconfig.util') @@ -113,12 +115,12 @@ function M.setup() require 'lspconfig'.omnisharp.setup { cmd = { '/usr/bin/omnisharp', '--languageserver', '--hostPID', tostring(pid) }, -- on_attach = M.on_attach, - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) + capabilities = capabilities, } require 'lspconfig'.powershell_es.setup { bundle_path = '/home/vladimir/devel/PowerShellEditorServices/module', - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) + capabilities = capabilities, } end diff --git a/dot_config/nvim/lua/configs/null-ls.lua b/dot_config/nvim/lua/configs/null-ls.lua index c7803d4..da1f0b5 100644 --- a/dot_config/nvim/lua/configs/null-ls.lua +++ b/dot_config/nvim/lua/configs/null-ls.lua @@ -1,22 +1,22 @@ local M = {} function M.setup() -local nls = require "null-ls" + local nls = require "null-ls" -nls.setup({ - debug = true, - sources = { - nls.builtins.formatting.xmllint, - nls.builtins.formatting.jq, - nls.builtins.diagnostics.sqlfluff, - nls.builtins.diagnostics.phpstan.with({ - cwd = function(params) - -- falls back to root if return value is nil - return params.root:match("jopixel") and not params.root:match("repo") and "www"; - end - }), - nls.builtins.formatting.phpcsfixer.with({ - extra_args = { "--rules", [[ { + nls.setup({ + debug = true, + sources = { + nls.builtins.formatting.xmllint, + nls.builtins.formatting.jq, + nls.builtins.diagnostics.sqlfluff, + nls.builtins.diagnostics.phpstan.with({ + cwd = function(params) + -- falls back to root if return value is nil + return params.root:match("jopixel") and not params.root:match("repo") and "www"; + end + }), + nls.builtins.formatting.phpcsfixer.with({ + extra_args = { "--rules", [[ { "@Symfony":true, "nullable_type_declaration_for_default_null_value":true, "array_syntax":{"syntax":"short"}, @@ -44,14 +44,14 @@ nls.setup({ }, "fully_qualified_strict_types":false } ]] } - }), - nls.builtins.diagnostics.shellcheck, - nls.builtins.formatting.eslint, - -- nls.builtins.diagnostics.eslint, - nls.builtins.code_actions.eslint, - nls.builtins.diagnostics.yamllint, - } -}) + }), + nls.builtins.diagnostics.shellcheck, + nls.builtins.formatting.eslint, + -- nls.builtins.diagnostics.eslint, + nls.builtins.code_actions.eslint, + nls.builtins.diagnostics.yamllint, + } + }) end return M diff --git a/dot_config/nvim/lua/configs/packages.lua b/dot_config/nvim/lua/configs/packages.lua index 7ce81f9..78a9f01 100644 --- a/dot_config/nvim/lua/configs/packages.lua +++ b/dot_config/nvim/lua/configs/packages.lua @@ -1,128 +1,131 @@ local M = {} function M.setup() - local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) - vim.cmd [[packadd packer.nvim]] - return true - end - return false + local ensure_packer = function() + local fn = vim.fn + local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' + if fn.empty(fn.glob(install_path)) > 0 then + fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) + vim.cmd [[packadd packer.nvim]] + return true end + return false + end - local packer_bootstrap = ensure_packer() + local packer_bootstrap = ensure_packer() - require('packer').startup(function(use, use_rocks) - use 'wbthomason/packer.nvim' + require('packer').startup(function(use, use_rocks) + use 'wbthomason/packer.nvim' - use { - 'neovim/nvim-lspconfig', - config = function() require("configs.lsp").setup() end, - requires = { 'b0o/schemastore.nvim' } - } - use { 'hrsh7th/nvim-cmp', requires = { 'neovim/nvim-lspconfig' }, config = require("configs.nvim-cmp").setup } - use { 'hrsh7th/cmp-nvim-lsp', requires = { 'hrsh7th/nvim-cmp' } } - use { 'hrsh7th/cmp-buffer', requires = { 'hrsh7th/nvim-cmp' } } - use { 'hrsh7th/cmp-path', requires = { 'hrsh7th/nvim-cmp' } } - use { 'hrsh7th/cmp-nvim-lua', requires = { 'hrsh7th/nvim-cmp' } } - use 'hrsh7th/vim-vsnip' - use 'hrsh7th/cmp-nvim-lsp-signature-help' + use { + 'neovim/nvim-lspconfig', + config = function() require("configs.lsp").setup() end, + requires = { 'b0o/schemastore.nvim' } + } + use { 'hrsh7th/nvim-cmp', requires = { 'neovim/nvim-lspconfig' }, config = require("configs.nvim-cmp").setup } + use { 'hrsh7th/cmp-nvim-lsp', requires = { 'hrsh7th/nvim-cmp' } } + use { 'hrsh7th/cmp-buffer', requires = { 'hrsh7th/nvim-cmp' } } + use { 'hrsh7th/cmp-path', requires = { 'hrsh7th/nvim-cmp' } } + use { 'hrsh7th/cmp-nvim-lua', requires = { 'hrsh7th/nvim-cmp' } } + use 'hrsh7th/vim-vsnip' + use 'hrsh7th/cmp-nvim-lsp-signature-help' - use { 'hrsh7th/cmp-vsnip', requires = { 'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip' } } - use { 'onsails/lspkind.nvim' } - use 'ray-x/lsp_signature.nvim' - use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } } - -- use { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' } - -- use { 'simrat39/symbols-outline.nvim', cmd = 'SymbolsOutline' } + use { 'hrsh7th/cmp-vsnip', requires = { 'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip' } } + use { 'onsails/lspkind.nvim' } + use 'ray-x/lsp_signature.nvim' + use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } } + -- use { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' } + -- use { 'simrat39/symbols-outline.nvim', cmd = 'SymbolsOutline' } - use { 'stevearc/dressing.nvim' } + use { 'stevearc/dressing.nvim' } - use { 'jose-elias-alvarez/null-ls.nvim', requires = { "nvim-lua/plenary.nvim" }, - config = require("configs.null-ls").setup } + use { 'jose-elias-alvarez/null-ls.nvim', requires = { "nvim-lua/plenary.nvim" }, + config = require("configs.null-ls").setup } - use { 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate', - config = require("configs.treesitter").setup, - } - use 'nvim-treesitter/playground' - use({ "yioneko/nvim-yati", requires = "nvim-treesitter/nvim-treesitter" }) + use { 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate', + config = require("configs.treesitter").setup, + } + use 'nvim-treesitter/playground' + use({ "yioneko/nvim-yati", requires = "nvim-treesitter/nvim-treesitter" }) - use { 'nvim-telescope/telescope.nvim', - requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' }, - config = require("configs.telescope").setup, - } - use { 'nvim-telescope/telescope-fzf-native.nvim', - run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' - } + use { 'nvim-telescope/telescope.nvim', + requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' }, + config = require("configs.telescope").setup, + } + use { 'nvim-telescope/telescope-fzf-native.nvim', + run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' + } - use { 'morhetz/gruvbox' } + use { 'morhetz/gruvbox' } - use { 'chrisbra/Colorizer', cmd = 'ColorToggle', keys = { 'n', 'c ColorToggle' } } + use { 'chrisbra/Colorizer', cmd = 'ColorToggle', keys = { 'n', 'c ColorToggle' } } - use { 'kdheepak/lazygit.nvim', keys = { 'n', 'g LazyGit' }, cmd = 'LazyGit' } - use { 'lewis6991/gitsigns.nvim', - requires = { 'nvim-lua/plenary.nvim' }, - config = function() require 'gitsigns'.setup({}) end } + use { 'kdheepak/lazygit.nvim', keys = { 'n', 'g LazyGit' }, cmd = 'LazyGit' } + use { 'lewis6991/gitsigns.nvim', + requires = { 'nvim-lua/plenary.nvim' }, + config = function() require 'gitsigns'.setup({}) end } - use { 'hoob3rt/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true }, - config = require("configs.lualine").setup - } + use { 'hoob3rt/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons' }, + config = require("configs.lualine").setup + } - use { 'AndrewRadev/linediff.vim', cmd = 'LineDiffAdd' } + use { 'AndrewRadev/linediff.vim', cmd = 'LineDiffAdd' } - use 'lukas-reineke/indent-blankline.nvim' + use 'lukas-reineke/indent-blankline.nvim' - use { - 'b3nj5m1n/kommentary', - config = function() require('kommentary.config').configure_language("php", - { prefer_single_line_comments = true, }) - end - } + use { + 'b3nj5m1n/kommentary', + config = function() require('kommentary.config').configure_language("php", + { prefer_single_line_comments = true, }) + end + } - use 'editorconfig/editorconfig-vim' + use 'editorconfig/editorconfig-vim' - use { - 'kyazdani42/nvim-tree.lua', - config = require("configs.nvimtree"), - disable = true, - } + use { + 'kyazdani42/nvim-tree.lua', + config = require("configs.nvimtree"), + disable = true, + } - use { - "nvim-neo-tree/neo-tree.nvim", - branch = "v2.x", - requires = { - "nvim-lua/plenary.nvim", - "kyazdani42/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - }, - config = require("configs.neotree").setup, - } + use { + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + requires = { + "nvim-lua/plenary.nvim", + "kyazdani42/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + }, + config = require("configs.neotree").setup, + } - use { 'vim-vdebug/vdebug' } + use { 'vim-vdebug/vdebug' } - use { 'dyng/ctrlsf.vim', cmd = 'CtrlSF' } + use { 'dyng/ctrlsf.vim', cmd = 'CtrlSF' } - use { 'folke/lua-dev.nvim' } - use { 'rafcamlet/nvim-luapad' } + use { 'folke/neodev.nvim' } + use { 'rafcamlet/nvim-luapad' } - use { 'AndrewRadev/tagalong.vim' } - use { 'andymass/vim-matchup' } + use { 'AndrewRadev/tagalong.vim' } + use { 'andymass/vim-matchup' } - use { 'fpob/nette.vim', ft = 'nette' } + use { 'fpob/nette.vim', ft = 'nette' } - use { - 'folke/trouble.nvim', - requires = "kyazdani42/nvim-web-devicons", - cmd = 'TroubleToggle', - keys = { 'n', 't TroubleToggle' }, - config = function() require('trouble').setup() end - } + use { + 'folke/trouble.nvim', + requires = "kyazdani42/nvim-web-devicons", + cmd = 'TroubleToggle', + keys = { 'n', 't TroubleToggle' }, + config = function() require('trouble').setup({ + mode = 'document_diagnostics' + }) + end + } - use { 'ziglang/zig.vim', ft = 'zig' } + use { 'ziglang/zig.vim', ft = 'zig' } if packer_bootstrap then require('packer').sync()