diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index ad0c433..df63a2a 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -24,9 +24,11 @@ require('packer').startup(function(use) 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 { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' } -- use { 'simrat39/symbols-outline.nvim', cmd = 'SymbolsOutline' } + use { 'stevearc/dressing.nvim' } + use { 'jose-elias-alvarez/null-ls.nvim', requires = { "nvim-lua/plenary.nvim" } } use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } @@ -84,12 +86,11 @@ require('packer').startup(function(use) config = function() require('trouble').setup() end } + use { 'ziglang/zig.vim', ft = 'zig' } if packer_bootstrap then require('packer').sync() end - use { 'ziglang/zig.vim', ft = 'zig' } - end) --- PACKAGES }}} @@ -170,7 +171,7 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'CodeActionMenu', opts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) buf_set_keymap('v', 'ca', 'lua vim.lsp.buf.range_code_action()', opts) buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) @@ -196,12 +197,11 @@ require 'lspconfig'.phpactor.setup { root_dir = function(startpath) local u = require('lspconfig.util') - return u.search_ancestors(startpath, function (path) - return - not string.find(path, '/vendor/') and ( + return u.search_ancestors(startpath, function(path) + return not string.find(path, '/vendor/') and ( u.path.exists(u.path.join(path, 'composer.json')) - or u.path.exists(u.path.join(path, '.git')) - ) + or u.path.exists(u.path.join(path, '.git')) + ) end) end } @@ -286,7 +286,7 @@ require 'lualine'.setup { inactive_sections = { lualine_a = {}, lualine_b = {}, - lualine_c = { { 'filename'} }, + lualine_c = { { 'filename' } }, lualine_x = { 'location' }, lualine_y = {}, lualine_z = {} @@ -317,7 +317,10 @@ require('nvim-tree').setup({ }, git = { ignore = true - } + }, + filters = { + custom = '_null-ls.*', + }, }) vim.api.nvim_set_keymap('n', '', [[NvimTreeToggle]], {}) @@ -376,6 +379,15 @@ vim.cmd 'augroup END' -- Telescope }}} +-- dressing.nvim {{{ +require('dressing').setup({ + input = { + relative = "editor", + }, +}) + +-- }}} + -- Tree sitter {{{ require 'nvim-treesitter.configs'.setup { ensure_installed = 'all', -- one of "all", "maintained" (parsers with maintainers), or a list of languages @@ -513,7 +525,7 @@ nls.setup({ } }, "fully_qualified_strict_types":false - } ]] } + } ]] } }), nls.builtins.diagnostics.shellcheck, nls.builtins.formatting.eslint,