Fix nvim autopairs

This commit is contained in:
Thomas Avé 2022-07-04 14:18:14 +02:00
parent 7222dd81d7
commit f750033433
4 changed files with 8 additions and 21 deletions

View File

@ -1,6 +1,6 @@
require('plugins') require('plugins')
require('settings')
require('autopairs_config') require('autopairs_config')
require('settings')
require('lsp_config') require('lsp_config')
require('telescope_config') require('telescope_config')
require('mappings') require('mappings')

View File

@ -1,11 +1,5 @@
local M = {}
function M.setup()
local npairs = require "nvim-autopairs" local npairs = require "nvim-autopairs"
npairs.setup { npairs.setup {
check_ts = true, check_ts = true,
} }
npairs.add_rules(require "nvim-autopairs.rules.endwise-lua") npairs.add_rules(require "nvim-autopairs.rules.endwise-lua")
end
return M

View File

@ -77,8 +77,8 @@ cmp.setup.cmdline(':', {
}) })
}) })
-- local cmp_autopairs = require('nvim-autopairs.completion.cmp') local cmp_completion = require('nvim-autopairs.completion.cmp')
-- cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) cmp.event:on('confirm_done',cmp_completion.on_confirm_done())
-- Setup lspconfig. -- Setup lspconfig.
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())

View File

@ -28,15 +28,8 @@ require('packer').startup(function(use)
use 'wbthomason/packer.nvim' use 'wbthomason/packer.nvim'
use 'williamboman/nvim-lsp-installer' use 'williamboman/nvim-lsp-installer'
use 'Vimjas/vim-python-pep8-indent' use 'Vimjas/vim-python-pep8-indent'
use 'windwp/nvim-autopairs'
use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
use {
"windwp/nvim-autopairs",
wants = "nvim-treesitter",
module = { "nvim-autopairs.completion.cmp", "nvim-autopairs" },
config = function()
require("config.autopairs").setup()
end,
}
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-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/plenary.nvim'}}} use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}}
use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end} use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end}