This commit is contained in:
elkowar 2020-11-21 17:38:51 +01:00
parent a1a68fb74b
commit 70fbed6a8d
3 changed files with 45 additions and 24 deletions

View file

@ -146,8 +146,6 @@ vnoremap K <Nop>
" Plugin configuration --------------------------------------------------- {{{ " Plugin configuration --------------------------------------------------- {{{
let g:VM_leader = 'm' let g:VM_leader = 'm'
autocmd BufReadPost * :DetectIndent autocmd BufReadPost * :DetectIndent
@ -190,9 +188,9 @@ au Syntax * RainbowParenthesesLoadBraces
nnoremap <C-p> :Files<CR> nnoremap <C-p> :Files<CR>
map <Leader>f <Plug>(easymotion-bd-f) "map <Leader>f <Plug>(easymotion-bd-f)
map <Leader>s <Plug>(easymotion-overwin-f2) "map <Leader>s <Plug>(easymotion-overwin-f2)
let g:EasyMotion_smartcase = 1 "let g:EasyMotion_smartcase = 1
let g:signify_sign_add = '▍' let g:signify_sign_add = '▍'
let g:signify_sign_delete = '▍' let g:signify_sign_delete = '▍'
@ -204,32 +202,46 @@ hi SignifySignDelete cterm=NONE gui=NONE guifg='#fb4934'
hi SignifySignChange cterm=NONE gui=NONE guifg='#83a598' hi SignifySignChange cterm=NONE gui=NONE guifg='#83a598'
hi SignifySignAdd cterm=NONE gui=NONE guifg='#8ec07c' hi SignifySignAdd cterm=NONE gui=NONE guifg='#8ec07c'
" Airline -------------------------------------------------------------------------- {{{
" Airline {{{
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
let g:airline_powerline_fonts = 0 let g:airline_powerline_fonts = 0
let g:airline_section_a = '%#__accent#%{airline#util#wrap(airline#parts#mode(),0)}%#__restore__#%{airline#util#append(airline#parts#iminsert(),0)}' function! AirlineInit()
let g:airline_section_a = '
\%#__accent#
\%{airline#util#wrap(airline#parts#mode(),0)}
\%#__restore__#
\%{airline#util#append(airline#parts#iminsert(),0)}'
let g:airline_section_b = '' let g:airline_section_b = ''
let g:airline_section_c = '%<%<%#__accent_red#%{airline#util#wrap(airline#parts#readonly(),0)}%#__restore__#%#__accent_bold#%{airline#util#wrap(airline#extensions#coc#get_status(),0)}%#__restore__#' let g:airline_section_c = '
\%<%<
\%#__accent_red#%{airline#util#wrap(airline#parts#readonly(),0)}
\%#__restore__#
\%#__accent_bold#
\%{airline#util#wrap(airline#extensions#coc#get_status(),0)}
\%#__restore__#'
let g:airline_section_y = '' let g:airline_section_y = ''
let g:airline_section_z = '%4l% %3v' let g:airline_section_z = '%4l% %3v'
let g:airline_section_warning = '%{airline#extensions#whitespace#check()}%{airline#util#wrap(airline#extensions#coc#get_warning(),0)}'
let g:airline_section_warning = '
\%{airline#extensions#whitespace#check()}
\%{airline#util#wrap(airline#extensions#coc#get_warning(),0)}'
let airline#extensions#coc#error_symbol = '' let airline#extensions#coc#error_symbol = ''
let airline#extensions#coc#warning_symbol = '' let airline#extensions#coc#warning_symbol = ''
let airline#extensions#coc#stl_format_err = '%E{[%e(#%fe)]}' let airline#extensions#coc#stl_format_err = '%E{[%e(#%fe)]}'
let airline#extensions#coc#stl_format_warn = '%W{[%w(#%fw)]}' let airline#extensions#coc#stl_format_warn = '%W{[%w(#%fw)]}'
endfun
autocmd User AirlineAfterInit call AirlineInit()
let g:airline_theme='elkowars_gruvbox' let g:airline_theme='elkowars_gruvbox'
" update airline themes properly... idk why this is so weird " update airline themes properly... idk why this is so weird
function! s:update_highlights() function! s:update_highlights()
hi airline_tabfill ctermbg=NONE guibg=NONE hi airline_tabfill ctermbg=NONE guibg=NONE
hi airline_a_to_airline_b ctermbg=NONE guibg='#ff0000'
hi airline_b_to_airline_c ctermbg=NONE guibg='#ff0000'
hi airline_c_to_airline_x ctermbg=NONE guibg=NONE
hi airline_tablabel_right ctermbg=NONE guibg=NONE ctermfg=NONE guifg=NONE hi airline_tablabel_right ctermbg=NONE guibg=NONE ctermfg=NONE guifg=NONE
endfunction endfunction
autocmd User AirlineAfterTheme call s:update_highlights() autocmd User AirlineAfterTheme call s:update_highlights()
@ -240,7 +252,8 @@ autocmd User AirlineAfterTheme call s:update_highlights()
" }}} " }}}
" :: and _ as space {{{ " :: and _ as space ------------------------------------------------------------------- {{{
function RebindShit(newKey) function RebindShit(newKey)
let b:RemappedSpace={ let b:RemappedSpace={
\ 'old': maparg("<Space>", "i"), \ 'old': maparg("<Space>", "i"),

View file

@ -6,6 +6,7 @@ endif
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
Plug 'tpope/vim-repeat' Plug 'tpope/vim-repeat'
Plug 'junegunn/goyo.vim', {'on': 'Goyo'} Plug 'junegunn/goyo.vim', {'on': 'Goyo'}
@ -32,7 +33,7 @@ call plug#begin('~/.vim/plugged')
Plug 'godlygeek/tabular' " :Tab /regex can align code on occurrences of the given regex. I.e. :Tab /= aligns all = signs in a block. Plug 'godlygeek/tabular' " :Tab /regex can align code on occurrences of the given regex. I.e. :Tab /= aligns all = signs in a block.
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
Plug 'easymotion/vim-easymotion' " press <leader>f [somekey] to have quick-movement to any occurrence of the key "Plug 'easymotion/vim-easymotion' " press <leader>f [somekey] to have quick-movement to any occurrence of the key
Plug 'christoomey/vim-tmux-navigator' " good integration with tmux pane switching Plug 'christoomey/vim-tmux-navigator' " good integration with tmux pane switching
Plug 'nathanaelkane/vim-indent-guides' " Can be toggled using <leader>ig (intent-guides) Plug 'nathanaelkane/vim-indent-guides' " Can be toggled using <leader>ig (intent-guides)

View file

@ -9,7 +9,7 @@ call which_key#register('<Space>', "g:which_key_map")
let g:which_key_map = { let g:which_key_map = {
\ 'h' : 'which_key_ignore', 'l' : 'which_key_ignore', \ 'h' : 'which_key_ignore', 'l' : 'which_key_ignore',
\ 'f' : 'which_key_ignore', 's': 'which_key_ignore' , "\ 'f' : 'which_key_ignore', 's': 'which_key_ignore' ,
\ 'c' : { 'name': '+comment_out' }, \ 'c' : { 'name': '+comment_out' },
\ 'e' : { 'name': '+emmet' }, \ 'e' : { 'name': '+emmet' },
\ '[' : ['<Plug>(YoinkPostPasteSwapBack)', 'Swap last paste backwards' ], \ '[' : ['<Plug>(YoinkPostPasteSwapBack)', 'Swap last paste backwards' ],
@ -44,6 +44,13 @@ let g:which_key_map['m'] = {
\ 'O' : [ '<Plug>(coc-openlink)' , 'open link under cursor' ] , \ 'O' : [ '<Plug>(coc-openlink)' , 'open link under cursor' ] ,
\} \}
let g:which_key_map['f'] = {
\ 'name': '+folds',
\ 'o': [ ':foldopen' , 'open fold' ] ,
\ 'n': [ ':foldclose' , 'close fold' ] ,
\ 'j': [ 'zj' , 'jump to next fold' ] ,
\ 'k': [ 'zk' , 'jump to previous fold' ] ,
\ }
let g:which_key_map['a'] = { let g:which_key_map['a'] = {
\ 'name': '+Bookmarks', \ 'name': '+Bookmarks',