tseeker-pub/heavim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style and shortcut tweaks. Added vim-which-key.

Browse source 
* Shortcut changes to make the Leader-based shortcuts easier to use
 * Install vim-which-key
 * Style fixes and changes
 * Reorganised some of the settings
This commit is contained in:
Emmanuel BENOîT 2020-12-07 16:36:17 +01:00
parent d1472f0e89
commit b0647949f8
19 changed files with 131 additions and 35 deletions

1
cfg/00-silent.vim
View file

@ -1,3 +1,2 @@
" 'Silent' command, can be used to run stuff silently then redrawing
command! -nargs=* -bang Silent execute ':silent<bang>'.' '.<q-args> | execute ':redraw!'

2
cfg/01-colours.vim
View file

@ -10,8 +10,6 @@ if &t_Co == 256
hi CursorLine cterm=NONE ctermbg=234
hi CursorColumn cterm=NONE ctermbg=233
hi ColorColumn ctermbg=52
hi LineNr ctermfg=58
hi CursorLineNr ctermfg=130
hi Search ctermfg=15 ctermbg=53
hi Folded ctermbg=17 ctermfg=227
endif

3
cfg/01-timeouts.vim
View file

@ -1,8 +1,7 @@
" Timeout settings for key sequences
set notimeout
set timeout
set timeoutlen=0
set ttimeout
set ttimeoutlen=-1
" Time between updates
set updatetime=100

3
cfg/03-hlsearch.vim
View file

@ -1,2 +1,3 @@
" Highlight search results, and clear that by hitting space very hard twice.
set hlsearch
nnoremap <silent> <Leader><space> :nohlsearch<CR>
nmap <silent> <Leader><space> :nohlsearch<CR>

7
cfg/03-mouse.vim
View file

@ -1,4 +1,4 @@
" Enable mouse by default, provide <Leader>M shortcut to toggle on/off
" Enable mouse by default, provide <Leader>om shortcut to toggle on/off
function! <SID>ToggleMouse()
if &g:mouse != ""
@ -11,7 +11,4 @@ function! <SID>ToggleMouse()
endfunction
set mouse=a
nnoremap <silent> <Leader>M :call <SID>ToggleMouse()<cr>
vnoremap <silent> <C-c> "+y
set pastetoggle=<Leader>P
nnoremap <silent> <Leader>om :call <SID>ToggleMouse()<cr>

2
cfg/03-x-copy.vim Normal file
View file

@ -0,0 +1,2 @@
" Map Ctrl+C to X-compatable copy
vnoremap <silent> <C-c> "+y

8
cfg/05-cursor.vim
View file

@ -1,4 +1,4 @@
" Cursor line & column: ' c' = invert, ' C' = mode, ' n' = line numbers
" Cursor line & column display
function! <SID>ToggleCursorMode()
if &cursorline && &cursorcolumn || !( &cursorline || &cursorcolumn )
set cursorline nocursorcolumn
@ -7,8 +7,6 @@ function! <SID>ToggleCursorMode()
endif
endfunction
nnoremap <silent> <Leader>c :set cursorline! cursorcolumn!<CR>
nnoremap <silent> <Leader>C :call <SID>ToggleCursorMode()<CR>
nnoremap <silent> <Leader>n :set number!<CR>
set cursorline number
nnoremap <silent> <Leader>oc :set cursorline! cursorcolumn!<CR>
nnoremap <silent> <Leader>oC :call <SID>ToggleCursorMode()<CR>

7
cfg/05-line-numbers.vim Normal file
View file

@ -0,0 +1,7 @@
" Line number display and related controls
highlight LineNr ctermbg=232 ctermfg=58 cterm=NONE
highlight CursorLineNr ctermbg=232 ctermfg=130 cterm=bold
set number relativenumber
nnoremap <silent> <Leader>on :set number!<CR>
nnoremap <silent> <Leader>oN :set relativenumber!<CR>

4
cfg/20-plugins.vim
View file

@ -3,5 +3,5 @@
call DoNeoBundleCheck( )
" Add key mappings for updates and installation
nnoremap <silent> <Leader>Bu :NeoBundleCheckUpdate<cr>
nnoremap <silent> <Leader>Bi :call DoNeoBundleCheck()<cr>
nnoremap <silent> <Leader>Pu :NeoBundleCheckUpdate<cr>
nnoremap <silent> <Leader>Pi :call DoNeoBundleCheck()<cr>

5
cfg/25-man.vim
View file

@ -1,7 +1,6 @@
" Make sure :Man is loaded, and map it.
" Make sure :Man is loaded, and map it. Also, remove the default mapping.
if exists( ':Man' ) != 2
source $VIMRUNTIME/ftplugin/man.vim
endif
unmap <Leader>K
nnoremap <Leader>hm :Man <cword><cr>

12
cfg/50-sign-column.vim
View file

@ -1,3 +1,13 @@
" Sign column color and visibility
let s:sc_modes = {
\ 'no' : 'yes' ,
\ 'yes' : 'no' ,
\ }
function! <SID>ToggleSignColumn()
let &signcolumn = s:sc_modes[ &g:signcolumn ]
endfunction
highlight SignColumn ctermfg=15 ctermbg=234
set signcolumn=yes
highlight SignColumn ctermbg=234
nmap <silent> <leader>os :call <SID>ToggleSignColumn()<cr>

9
cfg/50-vertical-split.vim
View file

@ -1,5 +1,8 @@
" Vertical split style and color
set fillchars+=vert:┃
highlight VertSplit ctermbg=234 ctermfg=29 cterm=NONE
highlight StatusLine ctermbg=0 ctermfg=234 cterm=inverse
highlight StatusLineNC ctermbg=234 ctermfg=234 cterm=inverse
highlight VertSplit ctermbg=234 ctermfg=29 cterm=NONE
highlight StatusLine ctermbg=15 ctermfg=234 cterm=inverse
highlight StatusLineNC ctermbg=234 ctermfg=234 cterm=inverse
highlight StatusLineTerm ctermbg=15 ctermfg=234 cterm=inverse
highlight StatusLineTermNC ctermbg=234 ctermfg=234 cterm=inverse
highlight WildMenu ctermbg=29 ctermfg=0 cterm=standout

6
cfg/99-paste-toggle.vim
View file

@ -1,2 +1,4 @@
" Configure the paste toggle shortcut
set pastetoggle=<Leader><S-F12>
" Configure the paste toggle shortcut and a mapping that also toggles paste,
" for use with vim-which-key.
set pastetoggle=<Leader>op
nnoremap <silent> <leader>op :set paste!<cr>