mirror of
https://git.decapod.one/brethil/dotfiles
synced 2024-11-01 02:11:30 +01:00
vim: misc cleanup
This commit is contained in:
parent
fc70cb13a8
commit
48b8791b4b
|
@ -112,12 +112,6 @@ nnoremap <leader>mk :bel copen<bar>silent (cargo run) !<bar>redraw!<cr>
|
||||||
autocmd FileType yaml setlocal shiftwidth=2 softtabstop=2 expandtab
|
autocmd FileType yaml setlocal shiftwidth=2 softtabstop=2 expandtab
|
||||||
autocmd FileType yml setlocal shiftwidth=2 softtabstop=2 expandtab
|
autocmd FileType yml setlocal shiftwidth=2 softtabstop=2 expandtab
|
||||||
|
|
||||||
function! GitStatus()
|
|
||||||
let [a,m,r] = GitGutterGetHunkSummary()
|
|
||||||
return printf('+%d ~%d -%d', a, m, r)
|
|
||||||
endfunction
|
|
||||||
set statusline+=%{GitStatus()}
|
|
||||||
|
|
||||||
" Improve vimdiff colors
|
" Improve vimdiff colors
|
||||||
highlight DiffAdd cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
|
highlight DiffAdd cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
|
||||||
highlight DiffDelete cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
|
highlight DiffDelete cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
|
||||||
|
@ -147,7 +141,7 @@ nnoremap <leader>wz :call WinZoomToggle()<CR>
|
||||||
nnoremap <leader>/ :G<CR>
|
nnoremap <leader>/ :G<CR>
|
||||||
nnoremap <leader>C :close<CR>
|
nnoremap <leader>C :close<CR>
|
||||||
nnoremap <leader>B :Bclose<CR>
|
nnoremap <leader>B :Bclose<CR>
|
||||||
nnoremap <leader>k :Ack
|
nnoremap <leader>k :Ack<Space>
|
||||||
nnoremap <leader>g :Git<CR>
|
nnoremap <leader>g :Git<CR>
|
||||||
nnoremap <leader>gd :Git diff<CR>
|
nnoremap <leader>gd :Git diff<CR>
|
||||||
nnoremap <leader>gp :Git push<CR>
|
nnoremap <leader>gp :Git push<CR>
|
||||||
|
@ -156,23 +150,14 @@ nnoremap <leader>M :Git commit<CR>
|
||||||
nnoremap <leader>u :GitGutterBufferToggle<CR>
|
nnoremap <leader>u :GitGutterBufferToggle<CR>
|
||||||
nnoremap <leader>L :GitGutterLineHighlightsToggle<CR>
|
nnoremap <leader>L :GitGutterLineHighlightsToggle<CR>
|
||||||
|
|
||||||
" OR map keys to use wrapping.
|
|
||||||
nmap <silent> <C-k> <Plug>(ale_previous_wrap)
|
nmap <silent> <C-k> <Plug>(ale_previous_wrap)
|
||||||
nmap <silent> <C-j> <Plug>(ale_next_wrap)
|
nmap <silent> <C-j> <Plug>(ale_next_wrap)
|
||||||
|
|
||||||
" this is assigned to jedi#goto_stubs()
|
|
||||||
" nunmap <leader>s
|
|
||||||
|
|
||||||
" nnoremap <leader>sv :ALEGoToTypeDefinitionInVSplit<CR>
|
|
||||||
" nnoremap <leader>sh :ALEGoToTypeDefinitionInSplit<CR>
|
|
||||||
" nnoremap <leader>st :ALEGoToTypeDefinitionInTab<CR>
|
|
||||||
" nnoremap <leader> :ALEGoToTypeDefinition<CR>
|
|
||||||
nmap <leader>sv :ALEGoToDefinition -vsplit<CR>
|
nmap <leader>sv :ALEGoToDefinition -vsplit<CR>
|
||||||
nmap <leader>sh :ALEGoToDefinition -split<CR>
|
nmap <leader>sh :ALEGoToDefinition -split<CR>
|
||||||
nmap <leader>st :ALEGoToDefinition -tab<CR>
|
nmap <leader>st :ALEGoToDefinition -tab<CR>
|
||||||
nmap <leader>A :ALEGoToDefinition<CR>
|
nmap <leader>A :ALEGoToDefinition<CR>
|
||||||
nmap <leader>n :ALEFindReferences<CR>
|
nmap <leader>n :ALEFindReferences<CR>
|
||||||
nmap <leader>n :ALEFindReferences<CR>
|
|
||||||
nmap <leader>h :ALEHover<CR>
|
nmap <leader>h :ALEHover<CR>
|
||||||
nmap <leader>r :ALERename<CR>
|
nmap <leader>r :ALERename<CR>
|
||||||
|
|
||||||
|
@ -183,3 +168,13 @@ noremap <Leader>y "*y
|
||||||
noremap <Leader>p "*p
|
noremap <Leader>p "*p
|
||||||
noremap <Leader>Y "+y
|
noremap <Leader>Y "+y
|
||||||
noremap <Leader>P "+p
|
noremap <Leader>P "+p
|
||||||
|
|
||||||
|
" These are the default mappings Default mappings
|
||||||
|
let g:multi_cursor_start_word_key = '<C-n>'
|
||||||
|
let g:multi_cursor_select_all_word_key = '<A-n>'
|
||||||
|
let g:multi_cursor_start_key = 'g<C-n>'
|
||||||
|
let g:multi_cursor_select_all_key = 'g<A-n>'
|
||||||
|
let g:multi_cursor_next_key = '<C-n>'
|
||||||
|
let g:multi_cursor_prev_key = '<C-p>'
|
||||||
|
let g:multi_cursor_skip_key = '<C-x>'
|
||||||
|
let g:multi_cursor_quit_key = '<Esc>'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user