diff options
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | init.lua | 92 |
2 files changed, 48 insertions, 47 deletions
@@ -68,7 +68,7 @@ # Autocompletes nvim-lspconfig nvim-cmp - cmp-nvim-lsp + /* cmp-nvim-lsp */ # File navigation lf-vim @@ -92,6 +92,7 @@ LanguageTool-nvim camelcasemotion vim-table-mode + copilot-vim ]; }; }; @@ -222,53 +222,53 @@ end -- local servers = { 'pyls', 'rust_analyzer', 'tsserver' } local servers = { 'jedi_language_server', 'bashls', 'terraformls' } -- Add additional capabilities supported by nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) --- Setup language servers -for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - flags = { - debounce_text_changes = 150, - }, - capabilities = capabilities, - } -end --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' +-- local capabilities = vim.lsp.protocol.make_client_capabilities() +-- capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +-- -- Setup language servers +-- for _, lsp in ipairs(servers) do +-- nvim_lsp[lsp].setup { +-- on_attach = on_attach, +-- flags = { +-- debounce_text_changes = 150, +-- }, +-- capabilities = capabilities, +-- } +-- end +-- -- Set completeopt to have a better completion experience +-- vim.o.completeopt = 'menuone,noselect' -- nvim-cmp setup -local cmp = require 'cmp' -cmp.setup { - mapping = { - ['<C-p>'] = cmp.mapping.select_prev_item(), - ['<C-n>'] = cmp.mapping.select_next_item(), - ['<C-d>'] = cmp.mapping.scroll_docs(-4), - ['<C-f>'] = cmp.mapping.scroll_docs(4), - ['<C-k>'] = cmp.mapping.complete(), - ['<C-e>'] = cmp.mapping.close(), - ['<CR>'] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - ['<Tab>'] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, - ['<S-Tab>'] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - }, -} +-- local cmp = require 'cmp' +-- cmp.setup { +-- mapping = { +-- ['<C-p>'] = cmp.mapping.select_prev_item(), +-- ['<C-n>'] = cmp.mapping.select_next_item(), +-- ['<C-d>'] = cmp.mapping.scroll_docs(-4), +-- ['<C-f>'] = cmp.mapping.scroll_docs(4), +-- ['<C-k>'] = cmp.mapping.complete(), +-- ['<C-e>'] = cmp.mapping.close(), +-- ['<CR>'] = cmp.mapping.confirm { +-- behavior = cmp.ConfirmBehavior.Replace, +-- select = true, +-- }, +-- ['<Tab>'] = function(fallback) +-- if cmp.visible() then +-- cmp.select_next_item() +-- else +-- fallback() +-- end +-- end, +-- ['<S-Tab>'] = function(fallback) +-- if cmp.visible() then +-- cmp.select_prev_item() +-- else +-- fallback() +-- end +-- end, +-- }, +-- sources = { +-- { name = 'nvim_lsp' }, +-- }, +-- } -- nvim-fzf vim.api.nvim_set_keymap('n', '<leader>ff', "<cmd>Files<cr>", { noremap = true }) |