master #1

Open
oli wants to merge 912 commits from master into lua
Showing only changes of commit 6b9089ee85 - Show all commits

View File

@@ -125,17 +125,8 @@ local plugins = {
config = function()
require('setup/my_cmp')
end,
event = "InsertEnter",
event = {'InsertEnter', 'CmdLineEnter'},
},
-- {
-- 'L3MON4D3/LuaSnip',
-- config = function()
-- require('setup/luasnip')
-- end,
-- dependencies =
-- {
-- 'rafamadriz/friendly-snippets'
-- }
{
'neovim/nvim-lspconfig',
dependencies = {
@@ -163,8 +154,8 @@ local plugins = {
require('setup/yanky')
end,
keys = {
{ 'n', '<c-n>' },
{ 'n', '<c-o>' }
{ '<c-n>' },
{ '<c-o>' }
},
dependencies = {
'nvim-telescope/telescope.nvim'
@@ -178,8 +169,9 @@ local plugins = {
config = function()
require('setup/aerial')
end,
cmd = 'AerialToggle',
keys = {
{ 'n', '<leader>s' }
{ '<leader>s' }
}
},
{