1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-04-14 23:49:19 +08:00

Merge remote-tracking branch 'stfl/tmux_navigator'

This commit is contained in:
Shidong Wang 2018-12-16 12:23:20 +08:00
commit 435a2bb1f6
2 changed files with 19 additions and 5 deletions

View File

@ -327,6 +327,8 @@ let g:spacevim_enable_cursorline = 1
let g:spacevim_statusline_separator = 'arrow'
let g:spacevim_statusline_inactive_separator = 'arrow'
let g:spacevim_tmux_navigator_modifier = 'ctrl'
""
" Define the left section of statusline in active windows. By default:
" >

View File

@ -47,10 +47,18 @@ function! SpaceVim#layers#tmux#config() abort
autocmd FocusLost * set nocursorline | redraw!
augroup END
nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
nnoremap <silent> <C-l> :TmuxNavigateRight<CR>
if s:tmux_navigator_modifier ==# 'alt'
nnoremap <silent> <M-h> :TmuxNavigateLeft<CR>
nnoremap <silent> <M-j> :TmuxNavigateDown<CR>
nnoremap <silent> <M-k> :TmuxNavigateUp<CR>
nnoremap <silent> <M-l> :TmuxNavigateRight<CR>
else
" elseif s:tmux_navigator_modifier ==# 'ctrl'
nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
nnoremap <silent> <C-l> :TmuxNavigateRight<CR>
endif
let g:neomake_tmux_enabled_makers = ['tmux']
let g:neomake_tmux_tmux_maker = {
\ 'exe': 'tmux',
@ -123,11 +131,15 @@ function! SpaceVim#layers#tmux#set_variable(var) abort
\ 'tmuxline_separators_alt',
\ g:spacevim_statusline_inactive_separator)
let s:tmux_navigator_modifier = get(a:var,
\ 'tmux_navigator_modifier',
\ g:spacevim_tmux_navigator_modifier)
endfunction
function! SpaceVim#layers#tmux#get_options() abort
return ['tmuxline_separators', 'tmuxline_separators_alt']
return ['tmuxline_separators', 'tmuxline_separators_alt', 'tmux_navigator_modifier']
endfunction