neovim backlog
This commit is contained in:
parent
43ea6d036e
commit
a2d62950b0
1 changed files with 19 additions and 38 deletions
|
@ -18,8 +18,9 @@ Plug 'mg979/vim-visual-multi'
|
||||||
"Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
|
"Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
|
||||||
Plug 'rhysd/committia.vim'
|
Plug 'rhysd/committia.vim'
|
||||||
Plug 'tpope/vim-sleuth'
|
Plug 'tpope/vim-sleuth'
|
||||||
Plug 'nvim-treesitter/nvim-treesitter'
|
|
||||||
Plug 'm-demare/hlargs.nvim'
|
Plug 'm-demare/hlargs.nvim'
|
||||||
|
Plug 'nvim-treesitter/nvim-treesitter'
|
||||||
|
Plug 'windwp/nvim-ts-autotag'
|
||||||
|
|
||||||
" interface
|
" interface
|
||||||
Plug 'romgrk/barbar.nvim'
|
Plug 'romgrk/barbar.nvim'
|
||||||
|
@ -29,9 +30,8 @@ Plug 'lukas-reineke/indent-blankline.nvim'
|
||||||
Plug 'folke/lsp-colors.nvim'
|
Plug 'folke/lsp-colors.nvim'
|
||||||
Plug 'nacro90/numb.nvim'
|
Plug 'nacro90/numb.nvim'
|
||||||
Plug 'xiyaowong/nvim-cursorword'
|
Plug 'xiyaowong/nvim-cursorword'
|
||||||
Plug 'simrat39/symbols-outline.nvim'
|
|
||||||
Plug 'kevinhwang91/nvim-hlslens'
|
Plug 'kevinhwang91/nvim-hlslens'
|
||||||
Plug 'SmiteshP/nvim-gps'
|
Plug 'simrat39/symbols-outline.nvim'
|
||||||
|
|
||||||
" language specific
|
" language specific
|
||||||
Plug 'sheerun/vim-polyglot'
|
Plug 'sheerun/vim-polyglot'
|
||||||
|
@ -40,7 +40,6 @@ Plug 'sheerun/vim-polyglot'
|
||||||
Plug 'dense-analysis/ale'
|
Plug 'dense-analysis/ale'
|
||||||
Plug 'neovim/nvim-lspconfig'
|
Plug 'neovim/nvim-lspconfig'
|
||||||
Plug 'nvim-lua/completion-nvim'
|
Plug 'nvim-lua/completion-nvim'
|
||||||
Plug 'windwp/nvim-ts-autotag'
|
|
||||||
Plug 'jose-elias-alvarez/null-ls.nvim'
|
Plug 'jose-elias-alvarez/null-ls.nvim'
|
||||||
|
|
||||||
Plug 'hrsh7th/nvim-cmp'
|
Plug 'hrsh7th/nvim-cmp'
|
||||||
|
@ -178,29 +177,25 @@ local feedkey = function(key, mode)
|
||||||
end
|
end
|
||||||
|
|
||||||
local mapping = {
|
local mapping = {
|
||||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
['<C-e>'] = cmp.mapping.abort(),
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
['<CR>'] = cmp.mapping.confirm({select = true}),
|
["<CR>"] = cmp.mapping.confirm({select = true}),
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
|
-- This little snippet will confirm with tab, and if no entry is selected, will confirm the first item
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
local entry = cmp.get_selected_entry()
|
||||||
elseif vim.fn["vsnip#available"](1) == 1 then
|
if not entry then
|
||||||
feedkey("<Plug>(vsnip-expand-or-jump)", "")
|
cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
|
||||||
elseif has_words_before() then
|
|
||||||
cmp.complete()
|
|
||||||
else
|
else
|
||||||
fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
|
cmp.confirm()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
else
|
||||||
["<S-Tab>"] = cmp.mapping(function()
|
fallback()
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_prev_item()
|
|
||||||
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
|
|
||||||
feedkey("<Plug>(vsnip-jump-prev)", "")
|
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, {"i", "s"}),
|
||||||
|
["<Esc>"] = cmp.mapping.abort(),
|
||||||
}
|
}
|
||||||
|
|
||||||
cmp.setup(
|
cmp.setup(
|
||||||
|
@ -264,14 +259,6 @@ lspconfig.tsserver.setup(
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
lua <<EOF
|
|
||||||
require("nvim-gps").setup(
|
|
||||||
{
|
|
||||||
disable_icons = true,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
EOF
|
|
||||||
|
|
||||||
" tre
|
" tre
|
||||||
let g:NERDTreeGitStatusIndicatorMapCustom = {
|
let g:NERDTreeGitStatusIndicatorMapCustom = {
|
||||||
\ 'Modified' :'U',
|
\ 'Modified' :'U',
|
||||||
|
@ -295,6 +282,7 @@ inoremap <silent> <S-Up> <Esc>:m-2<CR>
|
||||||
inoremap <silent> <S-Down> <Esc>:m+<CR>
|
inoremap <silent> <S-Down> <Esc>:m+<CR>
|
||||||
|
|
||||||
nnoremap <silent> <C-b> :NERDTreeToggle<CR>
|
nnoremap <silent> <C-b> :NERDTreeToggle<CR>
|
||||||
|
nnoremap <silent> <C-t> :SymbolsOutline<CR>
|
||||||
":lua require'bufferline.state'.set_offset(require'nvim-tree.view'.win_open() and 30 or 0)<CR>
|
":lua require'bufferline.state'.set_offset(require'nvim-tree.view'.win_open() and 30 or 0)<CR>
|
||||||
|
|
||||||
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
|
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
|
||||||
|
@ -423,7 +411,6 @@ hi StatusLineGitBranch ctermbg=5 ctermfg=0
|
||||||
hi StatusLineChar ctermbg=4 ctermfg=0
|
hi StatusLineChar ctermbg=4 ctermfg=0
|
||||||
hi StatusLineFormat ctermbg=3 ctermfg=0
|
hi StatusLineFormat ctermbg=3 ctermfg=0
|
||||||
hi StatusLineFileType ctermbg=7 ctermfg=0
|
hi StatusLineFileType ctermbg=7 ctermfg=0
|
||||||
hi StatusLineBreadcrumbs ctermbg=6 ctermfg=0
|
|
||||||
hi StatusLineEmpty ctermbg=8 ctermfg=2
|
hi StatusLineEmpty ctermbg=8 ctermfg=2
|
||||||
|
|
||||||
"call s:h('StatusLineMode', g:amora#palette.bgdark, g:amora#palette.red)
|
"call s:h('StatusLineMode', g:amora#palette.bgdark, g:amora#palette.red)
|
||||||
|
@ -457,10 +444,6 @@ function! GitBranch()
|
||||||
return strlen(l:branch) ? ' ' . l:branch . ' ' : ''
|
return strlen(l:branch) ? ' ' . l:branch . ' ' : ''
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! Breadcrumbs()
|
|
||||||
return luaeval('require("nvim-gps").is_available()') ? ' '.luaeval('require("nvim-gps").get_location()').' ' : ''
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
|
|
||||||
set statusline=
|
set statusline=
|
||||||
set statusline+=%#StatusLineMode#
|
set statusline+=%#StatusLineMode#
|
||||||
|
@ -472,8 +455,6 @@ set statusline+=\ %f
|
||||||
set statusline+=%#StatusLineEmpty#
|
set statusline+=%#StatusLineEmpty#
|
||||||
set statusline+=\ %m%r
|
set statusline+=\ %m%r
|
||||||
set statusline+=%=
|
set statusline+=%=
|
||||||
set statusline+=%#StatusLineBreadcrumbs#
|
|
||||||
set statusline+=%{Breadcrumbs()}
|
|
||||||
set statusline+=%#StatusLineChar#
|
set statusline+=%#StatusLineChar#
|
||||||
set statusline+=\ %l,\ %c\
|
set statusline+=\ %l,\ %c\
|
||||||
set statusline+=%#StatusLineFormat#
|
set statusline+=%#StatusLineFormat#
|
||||||
|
|
Loading…
Reference in a new issue