unify layz plugin import, allow return multiple plugins per file

This commit is contained in:
Baipyrus 2024-08-01 11:29:28 +02:00
parent e95ecf56e6
commit 689f994fbd
8 changed files with 166 additions and 150 deletions

View File

@ -7,6 +7,7 @@ vim.g.conflict_marker_end = '^>>>>>>> .*$'
-- Git conflict marker management plugin -- Git conflict marker management plugin
return { return {
{
'rhysd/conflict-marker.vim', 'rhysd/conflict-marker.vim',
config = function() config = function()
-- Highlight groups -- Highlight groups
@ -41,4 +42,5 @@ return {
callback = git_conflict_detection, callback = git_conflict_detection,
}) })
end, end,
},
} }

View File

@ -1,4 +1,5 @@
return { return {
{
-- Git related plugins -- Git related plugins
'tpope/vim-fugitive', 'tpope/vim-fugitive',
dependencies = { dependencies = {
@ -21,4 +22,5 @@ return {
-- Open history graph -- Open history graph
vim.keymap.set('n', '<leader>gl', '<cmd>Flogsplit<cr><cmd>wincmd k<cr><cmd>q<cr>', { desc = '[G]it [L]og' }) vim.keymap.set('n', '<leader>gl', '<cmd>Flogsplit<cr><cmd>wincmd k<cr><cmd>q<cr>', { desc = '[G]it [L]og' })
end, end,
},
} }

View File

@ -1,4 +1,6 @@
-- Plugin to intelligently reopen files at last edit position -- Plugin to intelligently reopen files at last edit position
return { return {
{
'farmergreg/vim-lastplace', 'farmergreg/vim-lastplace',
},
} }

View File

@ -1,4 +1,5 @@
return { return {
{
-- Set lualine as statusline -- Set lualine as statusline
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
-- See `:help lualine.txt` -- See `:help lualine.txt`
@ -10,4 +11,5 @@ return {
component_separators = { left = '', right = '' }, component_separators = { left = '', right = '' },
}, },
}, },
},
} }

View File

@ -1,5 +1,6 @@
-- Markdown preview plugin -- Markdown preview plugin
return { return {
{
'iamcco/markdown-preview.nvim', 'iamcco/markdown-preview.nvim',
cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
build = 'cd app; npm install', build = 'cd app; npm install',
@ -7,4 +8,5 @@ return {
vim.g.mkdp_filetypes = { 'markdown' } vim.g.mkdp_filetypes = { 'markdown' }
end, end,
ft = { 'markdown' }, ft = { 'markdown' },
},
} }

View File

@ -1,5 +1,6 @@
-- Smooth scroll plugin and keymaps -- Smooth scroll plugin and keymaps
return { return {
{
'karb94/neoscroll.nvim', 'karb94/neoscroll.nvim',
enabled = not vim.g.neovide, enabled = not vim.g.neovide,
config = function() config = function()
@ -25,4 +26,5 @@ return {
['zb'] = { 'zb', { '40' } }, ['zb'] = { 'zb', { '40' } },
} }
end, end,
},
} }

View File

@ -9,6 +9,7 @@ vim.api.nvim_create_autocmd('BufLeave', {
}) })
return { return {
{
'stevearc/oil.nvim', 'stevearc/oil.nvim',
-- Optional dependencies -- Optional dependencies
dependencies = { 'nvim-tree/nvim-web-devicons' }, dependencies = { 'nvim-tree/nvim-web-devicons' },
@ -28,4 +29,5 @@ return {
end end
end, { desc = '[F]ile [E]xplorer' }) end, { desc = '[F]ile [E]xplorer' })
end, end,
},
} }

View File

@ -1,4 +1,5 @@
return { return {
{
-- Simple task runner plugin -- Simple task runner plugin
'stevearc/overseer.nvim', 'stevearc/overseer.nvim',
opts = {}, opts = {},
@ -44,4 +45,5 @@ return {
-- Run task by listing all in floating -- Run task by listing all in floating
vim.keymap.set('n', '<leader>or', '<cmd>OverseerRun<cr>', { desc = '[O]verseer [R]un' }) vim.keymap.set('n', '<leader>or', '<cmd>OverseerRun<cr>', { desc = '[O]verseer [R]un' })
end, end,
},
} }