1
0
Fork 0
This commit is contained in:
Vladimír Dudr 2022-11-04 20:38:55 +01:00
parent f313eb7f69
commit 9287e8282c
5 changed files with 26 additions and 11 deletions

View file

@ -5,5 +5,3 @@ function! go#Gofmt(path) abort
exec 'edit!' exec 'edit!'
call winrestview(winstate) call winrestview(winstate)
endfunction endfunction

View file

@ -2,7 +2,6 @@ root = true
[*.lua] [*.lua]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
tab_width = 4 tab_width = 4
quote_style = single quote_style = single
insert_final_newline = true insert_final_newline = true

View file

@ -152,6 +152,17 @@ vim.api.nvim_create_autocmd('Colorscheme', {
end end
}) })
vim.api.nvim_create_autocmd('ColorschemePre', {
group = augr,
pattern = '*',
callback = function()
vim.fn.sign_define('DiagnosticSignError', { text = '', texthl = 'DiagnosticSignError' })
vim.fn.sign_define('DiagnosticSignWarn', { text = '', texthl = 'DiagnosticSignWarn' })
vim.fn.sign_define('DiagnosticSignInfo', { text = '', texthl = 'DiagnosticSignInfo' })
vim.fn.sign_define('DiagnosticSignHint', { text = '', texthl = 'DiagnosticSignHint' })
end
})
local term = vim.env.TERM local term = vim.env.TERM
if (term ~= 'linux' or vim.g.neoray) if (term ~= 'linux' or vim.g.neoray)
then then

View file

@ -10,6 +10,7 @@ function M.setup()
{ name = 'nvim_lua' }, { name = 'nvim_lua' },
{ name = 'buffer' }, { name = 'buffer' },
{ name = 'path' }, { name = 'path' },
{ name = 'vsnip' },
-- { name = 'nvim_lsp_signature_help' }, -- { name = 'nvim_lsp_signature_help' },
}, },
formatting = { formatting = {

View file

@ -35,18 +35,22 @@ function M.setup()
use { 'hrsh7th/cmp-path', requires = { 'hrsh7th/nvim-cmp' } } use { 'hrsh7th/cmp-path', requires = { 'hrsh7th/nvim-cmp' } }
use { 'hrsh7th/cmp-nvim-lua', requires = { 'hrsh7th/nvim-cmp' } } use { 'hrsh7th/cmp-nvim-lua', requires = { 'hrsh7th/nvim-cmp' } }
use { 'hrsh7th/vim-vsnip', config = function() use { 'hrsh7th/vim-vsnip', config = function()
vim.keymap.set({ 'i', 's' }, '<Tab>', [[vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : <Tab>]], { expr = true }) vim.api.nvim_exec([[
vim.keymap.set({ 'i', 's' }, '<S-Tab>', [[vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : <S-Tab>]], { expr = true }) imap <expr> <Tab> vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'
smap <expr> <Tab> vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'
imap <expr> <S-Tab> vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'
smap <expr> <S-Tab> vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'
]], false)
end } end }
use { 'rafamadriz/friendly-snippets' }
use 'hrsh7th/cmp-nvim-lsp-signature-help' use 'hrsh7th/cmp-nvim-lsp-signature-help'
use { 'hrsh7th/cmp-vsnip', requires = { 'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip' } } use { 'hrsh7th/cmp-vsnip', requires = { 'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip' } }
use { 'onsails/lspkind.nvim' } use { 'onsails/lspkind.nvim' }
use 'ray-x/lsp_signature.nvim' use 'ray-x/lsp_signature.nvim'
use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } } use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } }
-- use { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' }
-- use { 'simrat39/symbols-outline.nvim', cmd = 'SymbolsOutline' }
use { 'stevearc/dressing.nvim', config = function() use { 'stevearc/dressing.nvim', config = function()
require('dressing').setup({ require('dressing').setup({
@ -64,7 +68,7 @@ function M.setup()
config = require('configs.treesitter').setup, config = require('configs.treesitter').setup,
} }
use 'nvim-treesitter/playground' use 'nvim-treesitter/playground'
use({ 'yioneko/nvim-yati', requires = 'nvim-treesitter/nvim-treesitter' }) use({ 'yioneko/nvim-yati', requires = 'nvim-treesitter/nvim-treesitter', tag = 'legacy' })
use { 'nvim-telescope/telescope.nvim', use { 'nvim-telescope/telescope.nvim',
requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' }, requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' },
@ -97,8 +101,10 @@ function M.setup()
use { use {
'b3nj5m1n/kommentary', 'b3nj5m1n/kommentary',
config = function() require('kommentary.config').configure_language('php', config = function()
{ prefer_single_line_comments = true, }) local kommentary = require('kommentary.config')
kommentary.configure_language('php', { prefer_single_line_comments = true, })
kommentary.configure_language('lua', { prefer_single_line_comments = true, })
end end
} }
@ -122,7 +128,7 @@ function M.setup()
} }
use { use {
'vim-vdebug/vdebug', 'vlada-dudr/vdebug',
opt = true, opt = true,
} }