diff options
Diffstat (limited to 'vim/nvim/lua')
| -rw-r--r-- | vim/nvim/lua/config/autocomplete.lua | 85 | ||||
| -rw-r--r-- | vim/nvim/lua/config/diagnostic.lua | 29 | ||||
| -rw-r--r-- | vim/nvim/lua/config/init.lua | 4 | ||||
| -rw-r--r-- | vim/nvim/lua/config/lsp.lua | 37 | ||||
| -rw-r--r-- | vim/nvim/lua/config/treesitter.lua | 6 | ||||
| -rw-r--r-- | vim/nvim/lua/keybindings.lua | 26 | ||||
| -rw-r--r-- | vim/nvim/lua/plugins.lua | 7 |
7 files changed, 190 insertions, 4 deletions
diff --git a/vim/nvim/lua/config/autocomplete.lua b/vim/nvim/lua/config/autocomplete.lua new file mode 100644 index 0000000..b981bdb --- /dev/null +++ b/vim/nvim/lua/config/autocomplete.lua @@ -0,0 +1,85 @@ +local luasnip = require 'luasnip' +local lspkind = require('lspkind') +local cmp = require 'cmp' +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + ['<C-d>'] = cmp.mapping.scroll_docs(-4), + ['<C-f>'] = cmp.mapping.scroll_docs(4), + ['<C-Space>'] = cmp.mapping.complete(), + ['<CR>'] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = false, + }, + ['<Tab>'] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { 'i', 's' }), + ['<S-Tab>'] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { 'i', 's' }), + }), + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, + formatting = { + format = lspkind.cmp_format({ + mode = 'symbol_text', + maxwidth = 50, + ellipsis_char = '...', + }) + }, + window = { + documentation = cmp.config.window.bordered(), + completion = cmp.config.window.bordered(), + }, +} + +local api = require('cmp.utils.api') +local types = require('cmp.types') +local highlight = require('cmp.utils.highlight') +local autocmd = require('cmp.utils.autocmd') + +vim.api.nvim_set_hl(0, 'CmpItemAbbr', { link = 'CmpItemAbbrDefault', default = true }) +vim.api.nvim_set_hl(0, 'CmpItemAbbrDeprecated', { link = 'CmpItemAbbrDeprecatedDefault', default = true }) +vim.api.nvim_set_hl(0, 'CmpItemAbbrMatch', { link = 'CmpItemAbbrMatchDefault', default = true }) +vim.api.nvim_set_hl(0, 'CmpItemAbbrMatchFuzzy', { link = 'CmpItemAbbrMatchFuzzyDefault', default = true }) +vim.api.nvim_set_hl(0, 'CmpItemKind', { link = 'CmpItemKindDefault', default = true }) +vim.api.nvim_set_hl(0, 'CmpItemMenu', { link = 'CmpItemMenuDefault', default = true }) +for kind in pairs(types.lsp.CompletionItemKind) do + if type(kind) == 'string' then + local name = ('CmpItemKind%s'):format(kind) + vim.api.nvim_set_hl(0, name, { link = ('%sDefault'):format(name), default = true }) + end +end + +autocmd.subscribe('ColorScheme', function() + highlight.inherit('CmpItemAbbrDefault', 'Pmenu', { bg = 'NONE', default = false }) + highlight.inherit('CmpItemAbbrDeprecatedDefault', 'Comment', { bg = 'NONE', default = false }) + highlight.inherit('CmpItemAbbrMatchDefault', 'Pmenu', { bg = 'NONE', default = false }) + highlight.inherit('CmpItemAbbrMatchFuzzyDefault', 'Pmenu', { bg = 'NONE', default = false }) + highlight.inherit('CmpItemKindDefault', 'Special', { bg = 'NONE', default = false }) + highlight.inherit('CmpItemMenuDefault', 'Pmenu', { bg = 'NONE', default = false }) + for name in pairs(types.lsp.CompletionItemKind) do + if type(name) == 'string' then + vim.api.nvim_set_hl(0, ('CmpItemKind%sDefault'):format(name), { link = 'CmpItemKind', default = false }) + end + end +end) +autocmd.emit('ColorScheme') diff --git a/vim/nvim/lua/config/diagnostic.lua b/vim/nvim/lua/config/diagnostic.lua new file mode 100644 index 0000000..afa9c87 --- /dev/null +++ b/vim/nvim/lua/config/diagnostic.lua @@ -0,0 +1,29 @@ +vim.diagnostic.config({ + underline = true, + signs = true, + virtual_text = false, + float = { + show_header = true, + source = 'if_many', + focusable = false, + transparent = true, + }, + update_in_insert = true, -- default to false + severity_sort = false, -- default to false +}) + +vim.api.nvim_exec([[ autocmd InsertEnter * :lua vim.diagnostic.config({virtual_text = true}) ]], false) +vim.api.nvim_exec([[ autocmd InsertLeave * :lua vim.diagnostic.config({virtual_text = false}) ]], false) +vim.api.nvim_exec([[ autocmd CursorMoved * :lua vim.diagnostic.open_float({ silent=true }) ]], false) + +vim.lsp.handlers['textDocument/publishDiagnostics'] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, { + update_in_insert = true, + } +) + +local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " } +for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) +end diff --git a/vim/nvim/lua/config/init.lua b/vim/nvim/lua/config/init.lua new file mode 100644 index 0000000..94d770c --- /dev/null +++ b/vim/nvim/lua/config/init.lua @@ -0,0 +1,4 @@ +require('config.autocomplete') +require('config.diagnostic') +require('config.lsp') +require('config.treesitter') diff --git a/vim/nvim/lua/config/lsp.lua b/vim/nvim/lua/config/lsp.lua new file mode 100644 index 0000000..08213fe --- /dev/null +++ b/vim/nvim/lua/config/lsp.lua @@ -0,0 +1,37 @@ +local capabilities = require("cmp_nvim_lsp").default_capabilities() + +local lsp_flags = { + debounce_text_changes = 150, +} +require('lspconfig')['hls'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} +require('lspconfig')['tsserver'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} +require('lspconfig')['quick_lint_js'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} +require('clangd_extensions').setup() +require('lspconfig')['pylsp'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} + +require('lspconfig')['yamlls'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} +require('lspconfig')['bashls'].setup{ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} diff --git a/vim/nvim/lua/config/treesitter.lua b/vim/nvim/lua/config/treesitter.lua new file mode 100644 index 0000000..4e90be1 --- /dev/null +++ b/vim/nvim/lua/config/treesitter.lua @@ -0,0 +1,6 @@ +require'nvim-treesitter.configs'.setup { + highlight = { + enable = true, + additional_vim_regex_highlighting = { "haskell" }, + }, +} diff --git a/vim/nvim/lua/keybindings.lua b/vim/nvim/lua/keybindings.lua new file mode 100644 index 0000000..c66ba08 --- /dev/null +++ b/vim/nvim/lua/keybindings.lua @@ -0,0 +1,26 @@ +local opts = { noremap=true, silent=true } +vim.keymap.set('n', '<space>e', "<cmd>TroubleToggle<cr>", opts) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) +vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts) + +local on_attach = function(client, bufnr) + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', '<space>wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts) +end diff --git a/vim/nvim/lua/plugins.lua b/vim/nvim/lua/plugins.lua index 134d669..c751adf 100644 --- a/vim/nvim/lua/plugins.lua +++ b/vim/nvim/lua/plugins.lua @@ -3,7 +3,6 @@ return require('packer').startup(function(use) use 'vim-airline/vim-airline' use 'vim-airline/vim-airline-themes' use 'neovim/nvim-lspconfig' - use {'quick-lint/quick-lint-js', rtp = 'plugin/vim/quick-lint-js.vim', tag = '2.10.0', opt = true} use 'hrsh7th/nvim-cmp' use 'hrsh7th/cmp-nvim-lsp' use 'saadparwaiz1/cmp_luasnip' @@ -14,11 +13,11 @@ return require('packer').startup(function(use) requires = 'kyazdani42/nvim-web-devicons', config = function() require('trouble').setup { - - } +} end } use 'p00f/clangd_extensions.nvim' use 'nvim-treesitter/nvim-treesitter' - use { "briones-gabriel/darcula-solid.nvim", requires = "rktjmp/lush.nvim" } + use { 'briones-gabriel/darcula-solid.nvim', requires = 'rktjmp/lush.nvim' } + use 'joshdick/onedark.vim' end) |