From 17b2f25192de2e77fc698da8c781eab6c8078629 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 21 Aug 2024 18:11:46 -0500 Subject: [PATCH] Upload files to "config/nvim/lua/plugins" --- config/nvim/lua/plugins/init.lua | 2 + config/nvim/lua/plugins/lsp.lua | 63 ++++++++++++++++++++++++++ config/nvim/lua/plugins/treesitter.lua | 41 +++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 config/nvim/lua/plugins/lsp.lua create mode 100644 config/nvim/lua/plugins/treesitter.lua diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index e69de29..a69d229 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -0,0 +1,2 @@ +require('plugins.treesitter') +require('plugins.lsp') diff --git a/config/nvim/lua/plugins/lsp.lua b/config/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..983b4b8 --- /dev/null +++ b/config/nvim/lua/plugins/lsp.lua @@ -0,0 +1,63 @@ +lsp_zero = require('lsp-zero') + +lsp_zero.on_attach(function(client, bufnr) + -- see :help lsp-zero-keybindings + -- to learn the available actions + vim.keymap.set('n', 'gd', function() vim.lsp.buf.definition() end, opts) + vim.keymap.set('n', 'K', function() vim.lsp.buf.hover() end, opts) + vim.keymap.set('n', 'vws', function() vim.lsp.buf.workspace_symbol() end, opts) + vim.keymap.set('n', 'vd', function() vim.diagnostic.open_float() end, opts) + vim.keymap.set('n', '[d', function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set('n', ']d', function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set('n', 'vca', function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set('n', 'vrr', function() vim.lsp.buf.references() end, opts) + vim.keymap.set('n', 'vrn', function() vim.lsp.buf.rename() end, opts) + vim.keymap.set('i', '', function() vim.lsp.buf.signature_help() end, opts) + lsp_zero.default_keymaps({buffer = bufnr}) +end) + +-- to learn how to use mason.nvim +-- read this: https://github.com/VonHeikemen/lsp-zero.nvim/blob/v3.x/doc/md/guides/integrate-with-mason-nvim.md +require('mason').setup({}) +require('mason-lspconfig').setup({ + ensure_installed = {'tsserver','dockerls','lua_ls','terraformls','pyright','gopls'}, + handlers = { + function(server_name) + require('lspconfig')[server_name].setup({}) + end, + }, +}) +require'lspconfig'.gopls.setup{} + +local cmp = require('cmp') + +cmp.setup({ + sources = { + {name = 'nvim_lsp'}, + }, + mapping = { + [''] = cmp.mapping.confirm({select = false}), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.select_prev_item({behavior = 'select'}), + [''] = cmp.mapping.select_next_item({behavior = 'select'}), + [''] = cmp.mapping(function() + if cmp.visible() then + cmp.select_prev_item({behavior = 'insert'}) + else + cmp.complete() + end + end), + [''] = cmp.mapping(function() + if cmp.visible() then + cmp.select_next_item({behavior = 'insert'}) + else + cmp.complete() + end + end), + }, + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, +}) diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..9a396a6 --- /dev/null +++ b/config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,41 @@ +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the listed parsers MUST always be installed) + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (or "all") + ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + disable = { "c", "rust" }, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +}