diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index c60a4361d..b78cdea66 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -327,8 +327,6 @@ 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: " > diff --git a/autoload/SpaceVim/layers/tmux.vim b/autoload/SpaceVim/layers/tmux.vim index fef02ab96..6e54c6807 100644 --- a/autoload/SpaceVim/layers/tmux.vim +++ b/autoload/SpaceVim/layers/tmux.vim @@ -53,7 +53,6 @@ function! SpaceVim#layers#tmux#config() abort nnoremap :TmuxNavigateUp nnoremap :TmuxNavigateRight else - " elseif s:tmux_navigator_modifier ==# 'ctrl' nnoremap :TmuxNavigateLeft nnoremap :TmuxNavigateDown nnoremap :TmuxNavigateUp @@ -120,6 +119,7 @@ let s:i_separators = { let s:tmuxline_separators = g:spacevim_statusline_separator let s:tmuxline_separators_alt = g:spacevim_statusline_inactive_separator +let s:tmux_navigator_modifier = 'ctrl' function! SpaceVim#layers#tmux#set_variable(var) abort @@ -133,7 +133,7 @@ function! SpaceVim#layers#tmux#set_variable(var) abort let s:tmux_navigator_modifier = get(a:var, \ 'tmux_navigator_modifier', - \ g:spacevim_tmux_navigator_modifier) + \ s:tmux_navigator_modifier) endfunction diff --git a/docs/cn/layers/tmux.md b/docs/cn/layers/tmux.md index edb1b423a..7855d2181 100644 --- a/docs/cn/layers/tmux.md +++ b/docs/cn/layers/tmux.md @@ -37,10 +37,9 @@ lang: cn ## 模块选项 -- `tmuxline_separators`: default value is same as SpaceVim options `statusline_separator`, available - values include: `arrow`, `curve`, `slant`, `barce`, `fire`, `nil`. -- `tmuxline_separators_alt`: default value is same as SpaceVim options `statusline_inactive_separator` - available values include: `arrow`, `bar`, `nil`. +- `tmuxline_separators`: 设置tmux的主要分隔符,默认等同于SpaceVim的 `statusline_separator`, 可选值包括: `arrow`, `curve`, `slant`, `barce`, `fire`, `nil` +- `tmuxline_separators_alt`: 设置tmux的分隔符,默认等同于SpaceVim的 `statusline_inactive_separator`,可选值包括: `arrow`, `bar`, `nil` +- `tmux_navigator_modifier`: 设置 tmux 的移动快捷键,默认是 `ctrl`,可选值包括:`alt`, `ctrl` ## 快捷键 diff --git a/docs/layers/tmux.md b/docs/layers/tmux.md index 65b7a5ab5..dc89dca87 100644 --- a/docs/layers/tmux.md +++ b/docs/layers/tmux.md @@ -35,6 +35,7 @@ To use this configuration layer, update custom configuration file with: values include: `arrow`, `curve`, `slant`, `barce`, `fire`, `nil`. - `tmuxline_separators_alt`: default value is same as SpaceVim options `statusline_inactive_separator` available values include: `arrow`, `bar`, `nil`. +- `tmux_navigator_modifier`: option for change tmux navigator, default is `ctrl` ## Key bindings