|
|
@ -14,6 +14,20 @@ require('lualine').setup({
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
require('hop').setup()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
require('fzf-lua').setup({
|
|
|
|
|
|
|
|
winopts = {
|
|
|
|
|
|
|
|
width = 0.80,
|
|
|
|
|
|
|
|
height = 0.78,
|
|
|
|
|
|
|
|
row = 0.45,
|
|
|
|
|
|
|
|
col = 0.48,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- LSP-config
|
|
|
|
|
|
|
|
require('lspconfig').eslint.setup({})
|
|
|
|
|
|
|
|
|
|
|
|
require('lspconfig').stylelint_lsp.setup({
|
|
|
|
require('lspconfig').stylelint_lsp.setup({
|
|
|
|
settings = {
|
|
|
|
settings = {
|
|
|
|
stylelintplus = {
|
|
|
|
stylelintplus = {
|
|
|
@ -26,7 +40,7 @@ require('lspconfig').stylelint_lsp.setup({
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
require('lspconfig').cssls.setup({
|
|
|
|
require('lspconfig').cssls.setup({
|
|
|
|
filetypes = { 'css', 'scss' },
|
|
|
|
filetypes = { 'css', 'scss', 'sass' },
|
|
|
|
settings = {
|
|
|
|
settings = {
|
|
|
|
css = {
|
|
|
|
css = {
|
|
|
|
validate = false,
|
|
|
|
validate = false,
|
|
|
@ -34,48 +48,55 @@ require('lspconfig').cssls.setup({
|
|
|
|
scss = {
|
|
|
|
scss = {
|
|
|
|
validate = false,
|
|
|
|
validate = false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
sass = {
|
|
|
|
|
|
|
|
validate = false,
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
EOF
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
|
|
nnoremap <silent> <leader>, :BufferLinePick<cr>
|
|
|
|
|
|
|
|
nnoremap <silent> <leader>] :BufferLineCycleNext<CR>
|
|
|
|
|
|
|
|
nnoremap <silent> <leader>[ :BufferLineCyclePrev<CR>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" fugitive
|
|
|
|
" fugitive
|
|
|
|
nnoremap <silent> <leader>gs :G<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gs :G<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gd :Gvdiff<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gd :Gvdiff<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gc :Gcommit<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gc :Git commit<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gw :Gwrite<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gw :Gwrite<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gb :Gblame<cr><C-w>20+
|
|
|
|
nnoremap <silent> <leader>gb :Git blame<cr><C-w>20+
|
|
|
|
|
|
|
|
|
|
|
|
" fzf
|
|
|
|
" fzf
|
|
|
|
nnoremap <silent> <space>, :Files<cr>
|
|
|
|
nnoremap <silent> <leader>, <cmd>lua require('fzf-lua').files()<cr>
|
|
|
|
nnoremap <silent> <space>. :Buffers<cr>
|
|
|
|
nnoremap <silent> <leader>` <cmd>lua require('fzf-lua').files({ cwd = '~/' })<cr>
|
|
|
|
nnoremap <silent> <space>l :Lines<cr>
|
|
|
|
nnoremap <silent> <leader>. <cmd>lua require('fzf-lua').buffers()<cr>
|
|
|
|
nnoremap <silent> <space>a :Rg<cr>
|
|
|
|
nnoremap <silent> <leader>l <cmd>lua require('fzf-lua').lines()<cr>
|
|
|
|
nnoremap <silent> <space>h :History:<cr>
|
|
|
|
nnoremap <silent> <leader>a <cmd>lua require('fzf-lua').grep_project()<cr>
|
|
|
|
nnoremap <silent> <space>/ :History/<cr>
|
|
|
|
nnoremap <silent> <leader>; <cmd>lua require('fzf-lua').command_history()<cr>
|
|
|
|
nnoremap <silent> <space>c :Commits<cr>
|
|
|
|
nnoremap <silent> <leader>/ <cmd>lua require('fzf-lua').search_history()<cr>
|
|
|
|
|
|
|
|
nnoremap <silent> <leader>c <cmd>lua require('fzf-lua').git_commits()<cr>
|
|
|
|
" EasyMotion
|
|
|
|
nnoremap <silent> <leader>b <cmd>lua require('fzf-lua').git_branches()<cr>
|
|
|
|
let g:EasyMotion_do_mapping=0
|
|
|
|
|
|
|
|
let g:EasyMotion_smartcase=1
|
|
|
|
" Hop
|
|
|
|
nmap <leader>j <Plug>(easymotion-overwin-f2)
|
|
|
|
nnoremap <silent> <space>j <cmd>lua require('hop').hint_words()<cr>
|
|
|
|
|
|
|
|
|
|
|
|
" Floaterm
|
|
|
|
" Floaterm
|
|
|
|
let g:floaterm_keymap_toggle = '<space>t'
|
|
|
|
let g:floaterm_keymap_toggle = '<space>t'
|
|
|
|
let g:floaterm_width = 0.9
|
|
|
|
let g:floaterm_width = 0.8
|
|
|
|
let g:floaterm_height = 0.62
|
|
|
|
let g:floaterm_height = 0.8
|
|
|
|
let g:floaterm_autoclose = 1
|
|
|
|
let g:floaterm_autoclose = 1
|
|
|
|
let g:floaterm_opener = 'edit'
|
|
|
|
let g:floaterm_opener = 'edit'
|
|
|
|
let g:floaterm_borderchars = '─│─│╭╮╯╰'
|
|
|
|
let g:floaterm_borderchars = '─│─│╭╮╯╰'
|
|
|
|
let g:floaterm_title = ''
|
|
|
|
let g:floaterm_title = ''
|
|
|
|
hi FloatermBorder guibg='#282828' guifg='#a89984'
|
|
|
|
hi FloatermBorder guibg='#282828' guifg='#fbf1c7'
|
|
|
|
nnoremap <silent> - :FloatermNew nnn<cr>
|
|
|
|
nnoremap <silent> - :FloatermNew nnn<cr>
|
|
|
|
nnoremap <silent> <space>g :FloatermNew lazygit<cr>
|
|
|
|
nnoremap <silent> <space>g :FloatermNew lazygit<cr>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" COC.vim
|
|
|
|
" COC.vim
|
|
|
|
|
|
|
|
" TODO LSP-alternatives
|
|
|
|
|
|
|
|
" nmap <leader>c <Plug>(coc-rename)
|
|
|
|
|
|
|
|
" nmap <leader>e <Plug>(coc-diagnostic-next)
|
|
|
|
|
|
|
|
" xmap <leader>f <Plug>(coc-format-selected)
|
|
|
|
|
|
|
|
" nmap <leader>f <Plug>(coc-format-selected)
|
|
|
|
|
|
|
|
|
|
|
|
inoremap <silent><expr> <C-j>
|
|
|
|
inoremap <silent><expr> <C-j>
|
|
|
|
\ pumvisible() ? coc#_select_confirm() :
|
|
|
|
\ pumvisible() ? coc#_select_confirm() :
|
|
|
|
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<cr>" :
|
|
|
|
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<cr>" :
|
|
|
@ -115,12 +136,6 @@ function! s:show_documentation()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Leader mappings
|
|
|
|
|
|
|
|
nmap <leader>c <Plug>(coc-rename)
|
|
|
|
|
|
|
|
nmap <leader>e <Plug>(coc-diagnostic-next)
|
|
|
|
|
|
|
|
xmap <leader>f <Plug>(coc-format-selected)
|
|
|
|
|
|
|
|
nmap <leader>f <Plug>(coc-format-selected)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Selection ranges
|
|
|
|
" Selection ranges
|
|
|
|
nmap <silent> <C-s> <Plug>(coc-range-select)
|
|
|
|
nmap <silent> <C-s> <Plug>(coc-range-select)
|
|
|
|
xmap <silent> <C-s> <Plug>(coc-range-select)
|
|
|
|
xmap <silent> <C-s> <Plug>(coc-range-select)
|
|
|
|