oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

Merge branch 'master' of https://git.freiewildbahn.de/oli/nvim

Browse Source
This commit is contained in:
Oliver Hartmann 2022-04-04 14:49:13 +02:00
commit 1c10794866
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lua/my_plugins.lua
View File

@ -38,6 +38,7 @@ return require('packer').startup(function()
use({ use({
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
run = ':TSUpdate', run = ':TSUpdate',
event = 'BufRead',
config = get_setup('treesitter'), config = get_setup('treesitter'),
}) })
use({ use({
@ -78,22 +79,23 @@ return require('packer').startup(function()
}) })
use({ use({
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
event = 'InsertEnter',
requires = { requires = {
'hrsh7th/cmp-buffer', { 'hrsh7th/cmp-buffer', after = 'nvim-cmp' },
'hrsh7th/cmp-nvim-lsp', { 'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp' },
'L3MON4D3/LuaSnip', { 'L3MON4D3/LuaSnip', after = 'nvim-cmp' },
'saadparwaiz1/cmp_luasnip', { 'saadparwaiz1/cmp_luasnip', after = 'nvim-cmp' },
'hrsh7th/cmp-nvim-lua', { 'hrsh7th/cmp-nvim-lua', after = 'nvim-cmp' },
'octaltree/cmp-look', { 'octaltree/cmp-look', after = 'nvim-cmp' },
'hrsh7th/cmp-path', { 'hrsh7th/cmp-path', after = 'nvim-cmp' },
'hrsh7th/cmp-calc', { 'hrsh7th/cmp-calc', after = 'nvim-cmp' },
'f3fora/cmp-spell', { 'f3fora/cmp-spell', after = 'nvim-cmp' },
'hrsh7th/cmp-emoji', { 'hrsh7th/cmp-emoji', after = 'nvim-cmp' },
'hrsh7th/cmp-cmdline', { 'hrsh7th/cmp-cmdline', after = 'nvim-cmp' },
}, },
config = get_setup('cmp'), config = get_setup('cmp'),
}) })
use({ 'L3MON4D3/LuaSnip', config = get_setup('luasnip') }) use({ 'L3MON4D3/LuaSnip', event = 'InsertEnter', config = get_setup('luasnip') })
use({ 'rafamadriz/friendly-snippets' }) use({ 'rafamadriz/friendly-snippets' })
use({ 'onsails/lspkind-nvim' }) use({ 'onsails/lspkind-nvim' })
use({ 'Shatur/neovim-cmake', requires = { 'mfussenegger/nvim-dap' }, config = get_setup('cmake') }) use({ 'Shatur/neovim-cmake', requires = { 'mfussenegger/nvim-dap' }, config = get_setup('cmake') })
@ -106,7 +108,7 @@ return require('packer').startup(function()
'ahmedkhalf/project.nvim', 'ahmedkhalf/project.nvim',
config = get_setup('project'), config = get_setup('project'),
}) })
use({ 'p00f/nvim-ts-rainbow' }) use({ 'p00f/nvim-ts-rainbow', requires = 'nvim-treesitter/nvim-treesitter', after = 'nvim-treesitter' })
use({ use({
'windwp/nvim-autopairs', 'windwp/nvim-autopairs',
config = get_setup('nvim-autopairs'), config = get_setup('nvim-autopairs'),
@ -131,12 +133,14 @@ return require('packer').startup(function()
use({ use({
'danymat/neogen', 'danymat/neogen',
requires = 'nvim-treesitter/nvim-treesitter', requires = 'nvim-treesitter/nvim-treesitter',
after = 'nvim-treesitter',
config = get_setup('neogen'), config = get_setup('neogen'),
}) })
use({ 'abecodes/tabout.nvim' }) use({ 'abecodes/tabout.nvim' })
use({ 'stevearc/dressing.nvim' }) use({ 'stevearc/dressing.nvim' })
use({ use({
'nvim-treesitter/nvim-treesitter-textobjects', 'nvim-treesitter/nvim-treesitter-textobjects',
after = 'nvim-treesitter',
requires = 'nvim-treesitter/nvim-treesitter', requires = 'nvim-treesitter/nvim-treesitter',
}) })
use({ use({

1
lua/setup/lspinstall.lua
View File

@ -102,7 +102,6 @@ local servers = {
'cmake', 'cmake',
'clangd', 'clangd',
'jsonls', 'jsonls',
'groovyls',
'sumneko_lua', 'sumneko_lua',
'dockerls', 'dockerls',
} }

2
lua/setup/luasnip.lua
View File

@ -52,4 +52,4 @@ ls.snippets = {
}) })
}, },
} }
require('luasnip.loaders.from_vscode').load() require('luasnip.loaders.from_vscode').lazy_load()