diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index db8715339..d9cf956a8 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -281,7 +281,6 @@ let g:spacevim_info_symbol = SpaceVim#api#import('messletters').circ " set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' " < let g:spacevim_terminal_cursor_shape = 2 -let g:spacevim_use_colorscheme = 1 "" " Set the help language of vim. Default is 'en'. " You can change it to Chinese. @@ -627,10 +626,6 @@ function! SpaceVim#end() abort elseif g:spacevim_vim_help_language ==# 'ja' call SpaceVim#layers#load('japanese') endif - if g:spacevim_use_colorscheme==1 - call SpaceVim#layers#load('colorscheme') - endif - "" " generate tags for SpaceVim let help = fnamemodify(g:_spacevim_root_dir, ':p:h:h') . '/doc' diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim index 7e20e9082..e6a7571c8 100644 --- a/autoload/SpaceVim/default.vim +++ b/autoload/SpaceVim/default.vim @@ -138,7 +138,6 @@ function! SpaceVim#default#layers() abort call SpaceVim#layers#load('checkers') call SpaceVim#layers#load('format') call SpaceVim#layers#load('edit') - call SpaceVim#layers#load('tools') call SpaceVim#layers#load('ui') call SpaceVim#layers#load('core') call SpaceVim#layers#load('core#banner') diff --git a/autoload/SpaceVim/layers/colorscheme.vim b/autoload/SpaceVim/layers/colorscheme.vim index 0a09ad38a..4e1b0ba6e 100644 --- a/autoload/SpaceVim/layers/colorscheme.vim +++ b/autoload/SpaceVim/layers/colorscheme.vim @@ -149,7 +149,6 @@ function! SpaceVim#layers#colorscheme#plugins() abort return [ - \ ['morhetz/gruvbox', {'loadconf' : 1, 'merged' : 0}], \ ['kristijanhusak/vim-hybrid-material', { 'merged' : 0 }], \ ['altercation/vim-colors-solarized', { 'merged' : 0 }], \ ['nanotech/jellybeans.vim', { 'merged' : 0 }], diff --git a/autoload/SpaceVim/layers/core.vim b/autoload/SpaceVim/layers/core.vim index b9184cb26..1d9a9df8a 100644 --- a/autoload/SpaceVim/layers/core.vim +++ b/autoload/SpaceVim/layers/core.vim @@ -11,6 +11,7 @@ function! SpaceVim#layers#core#plugins() abort if g:spacevim_filemanager ==# 'nerdtree' call add(plugins, ['scrooloose/nerdtree', { 'on_cmd' : 'NERDTreeToggle', \ 'loadconf' : 1}]) + call add(plugins, ['Xuyuanp/nerdtree-git-plugin', {'merged' : 0}]) elseif g:spacevim_filemanager ==# 'vimfiler' call add(plugins, ['Shougo/vimfiler.vim',{'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1, 'on_cmd' : ['VimFiler', 'VimFilerBufferDir']}]) call add(plugins, ['Shougo/unite.vim',{ 'merged' : 0 , 'loadconf' : 1}]) @@ -21,7 +22,17 @@ function! SpaceVim#layers#core#plugins() abort call add(plugins, ['rhysd/clever-f.vim']) call add(plugins, ['andymass/vim-matchup']) - + call add(plugins, ['morhetz/gruvbox', {'loadconf' : 1, 'merged' : 0}]) + call add(plugins, ['tyru/open-browser.vim', { + \'on_cmd' : ['OpenBrowserSmartSearch', 'OpenBrowser', + \ 'OpenBrowserSearch'], + \'on_map' : '(openbrowser-', + \ 'loadconf' : 1, + \}]) + call add(plugins, ['tpope/vim-projectionist', { 'on_cmd' : ['A', 'AS', 'AV', + \ 'AT', 'AD', 'Cd', 'Lcd', 'ProjectDo']}]) + call add(plugins, ['mhinz/vim-grepper' , { 'on_cmd' : 'Grepper', + \ 'loadconf' : 1} ]) return plugins endfunction diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim index 027eb0324..f7acc3fc1 100644 --- a/autoload/SpaceVim/layers/edit.vim +++ b/autoload/SpaceVim/layers/edit.vim @@ -30,6 +30,9 @@ function! SpaceVim#layers#edit#plugins() abort \ ['editorconfig/editorconfig-vim', { 'merged' : 0}], \ ['floobits/floobits-neovim', { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}], \ ['osyo-manga/vim-jplus', { 'on_map' : '(jplus' }], + \ ['godlygeek/tabular', { 'on_cmd' : 'Tabularize'}], + \ ['ntpeters/vim-better-whitespace', { 'on_cmd' : 'StripWhitespace'}], + \ ['ianva/vim-youdao-translater', { 'on_cmd' : ['Ydv','Ydc','Yde']}], \ ] if executable('fcitx') call add(plugins,['lilydjwg/fcitx.vim', { 'on_event' : 'InsertEnter'}]) @@ -517,6 +520,6 @@ function! s:add_buffer_head() abort endif endfunction -function! SpaceVim#layers#edit#add_ft_head_tamplate(ft, tamp) +function! SpaceVim#layers#edit#add_ft_head_tamplate(ft, tamp) abort call extend(s:ft_head_tp, {a:ft : a:tamp}) endfunction diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim index a12d2ee1f..c83ae06aa 100644 --- a/autoload/SpaceVim/layers/tools.vim +++ b/autoload/SpaceVim/layers/tools.vim @@ -7,45 +7,20 @@ "============================================================================= function! SpaceVim#layers#tools#plugins() abort - let plugins = [ - \ ['tpope/vim-scriptease'], - \ ['mbbill/fencview', { 'on_cmd' : 'FencAutoDetect'}], - \ ['wsdjeg/vim-cheat', { 'on_cmd' : 'Cheat'}], - \ ['wsdjeg/SourceCounter.vim', { 'on_cmd' : 'SourceCounter'}], - \ ['junegunn/goyo.vim', { 'on_cmd' : 'Goyo', - \ 'loadconf' : 1}], - \ ['junegunn/limelight.vim', { 'on_cmd' : 'Limelight'}], - \ ['MattesGroeger/vim-bookmarks', { 'on_map' : 'Bookmark', - \ 'on_cmd' : 'BookmarkShowAll', - \ 'loadconf_before' : 1}], - \ ['simnalamburt/vim-mundo', { 'on_cmd' : 'MundoToggle'}], - \ ['mhinz/vim-grepper' , { 'on_cmd' : 'Grepper', - \ 'loadconf' : 1} ], - \ ['tpope/vim-projectionist', { 'on_cmd' : ['A', 'AS', 'AV', - \ 'AT', 'AD', 'Cd', 'Lcd', 'ProjectDo']}], - \ ['ntpeters/vim-better-whitespace', { 'on_cmd' : 'StripWhitespace'}], - \ ['junegunn/rainbow_parentheses.vim', - \ { 'on_cmd' : 'RainbowParentheses'}], - \ ['tyru/open-browser.vim', { - \'on_cmd' : ['OpenBrowserSmartSearch', 'OpenBrowser', - \ 'OpenBrowserSearch'], - \'on_map' : '(openbrowser-', - \ 'loadconf' : 1, - \}], - \ ['godlygeek/tabular', { 'on_cmd' : 'Tabularize'}], - \ ['itchyny/calendar.vim', { 'on_cmd' : 'Calendar'}], - \ ['wsdjeg/Mysql.vim', { 'on_cmd' : 'SQLGetConnection'}], - \ ['wsdjeg/job.vim', { 'merged' : 0}], - \ ['ianva/vim-youdao-translater', { 'on_cmd' : ['Ydv','Ydc','Yde']}], - \ ['vim-scripts/TaskList.vim', { 'on_cmd' : 'TaskList'}], - \ ['MarcWeber/vim-addon-mw-utils'], - \ ['vim-scripts/taglist.vim', { 'on_cmd' : 'TlistToggle', 'loadconf' : 1}], - \ ['Xuyuanp/nerdtree-git-plugin'], - \ ['lymslive/vimloo', {'merged' : 0}], - \ ['lymslive/vnote', {'depends' : 'vimloo', - \ 'on_cmd' : ['NoteBook','NoteNew','NoteEdit', 'NoteList', 'NoteConfig', 'NoteIndex', 'NoteImport']}], - \ ] - + let plugins = [] + call add(plugins, ['tpope/vim-scriptease', { 'merged' : 0}]) + call add(plugins, ['lymslive/vimloo', { 'merged' : 0}]) + call add(plugins, ['lymslive/vnote', { 'depends' : 'vimloo', 'on_cmd' : ['NoteBook','NoteNew','NoteEdit', 'NoteList', 'NoteConfig', 'NoteIndex', 'NoteImport']}]) + call add(plugins, ['junegunn/rainbow_parentheses.vim', { 'on_cmd' : 'RainbowParentheses'}]) + call add(plugins, ['mbbill/fencview', { 'on_cmd' : 'FencAutoDetect'}]) + call add(plugins, ['simnalamburt/vim-mundo', { 'on_cmd' : 'MundoToggle'}]) + call add(plugins, ['wsdjeg/vim-cheat', { 'on_cmd' : 'Cheat'}]) + call add(plugins, ['wsdjeg/Mysql.vim', { 'on_cmd' : 'SQLGetConnection'}]) + call add(plugins, ['wsdjeg/SourceCounter.vim', { 'on_cmd' : 'SourceCounter'}]) + call add(plugins, ['itchyny/calendar.vim', { 'on_cmd' : 'Calendar'}]) + call add(plugins, ['junegunn/limelight.vim', { 'on_cmd' : 'Limelight'}]) + call add(plugins, ['junegunn/goyo.vim', { 'on_cmd' : 'Goyo', 'loadconf' : 1}]) + call add(plugins, ['MattesGroeger/vim-bookmarks', { 'on_map' : 'Bookmark', 'on_cmd' : 'BookmarkShowAll', 'loadconf_before' : 1}]) let s:CMP = SpaceVim#api#import('vim#compatible') if s:CMP.has('python') call add(plugins, ['gregsexton/VimCalc', {'on_cmd' : 'Calc'}]) @@ -62,6 +37,10 @@ function! SpaceVim#layers#tools#config() abort call SpaceVim#mapping#space#def('nnoremap', ['e', 'a'], 'FencAutoDetect', \ 'Auto detect the file encoding', 1) call SpaceVim#mapping#space#def('nnoremap', ['a', 'c'], 'Calc', 'vim calculator', 1) + call SpaceVim#mapping#space#def('nnoremap', ['w', 'c'], + \ 'Goyo', 'centered-buffer-mode', 1) + call SpaceVim#mapping#space#def('nnoremap', ['w', 'C'], + \ 'ChooseWin | Goyo', 'centered-buffer-mode(other windows)', 1) nmap mm BookmarkToggle nmap mi BookmarkAnnotate nmap ma BookmarkShowAll diff --git a/autoload/SpaceVim/layers/ui.vim b/autoload/SpaceVim/layers/ui.vim index fdd91f82d..573aa8354 100644 --- a/autoload/SpaceVim/layers/ui.vim +++ b/autoload/SpaceVim/layers/ui.vim @@ -16,7 +16,6 @@ function! SpaceVim#layers#ui#plugins() abort \ ['lvht/tagbar-markdown',{'merged' : 0}], \ ['t9md/vim-choosewin', {'merged' : 0}], \ ['mhinz/vim-startify', {'loadconf' : 1, 'merged' : 0}], - \ ['blueyed/vim-diminactive', {'merged' : 0}], \ ] if get(g:, '_spacevim_statusline_loaded', 0) == 0 call add(plugins, ['vim-airline/vim-airline', { 'merged' : 0, diff --git a/autoload/SpaceVim/mapping/space.vim b/autoload/SpaceVim/mapping/space.vim index 2fdc51921..883d9ad94 100644 --- a/autoload/SpaceVim/mapping/space.vim +++ b/autoload/SpaceVim/mapping/space.vim @@ -55,10 +55,6 @@ function! SpaceVim#mapping#space#init() abort \ 'call call(' \ . string(function('s:windows_layout_toggle')) \ . ', [])', 'windows-layout-toggle', 1) - call SpaceVim#mapping#space#def('nnoremap', ['w', 'c'], - \ 'Goyo', 'centered-buffer-mode', 1) - call SpaceVim#mapping#space#def('nnoremap', ['w', 'C'], - \ 'ChooseWin | Goyo', 'centered-buffer-mode(other windows)', 1) call SpaceVim#mapping#space#def('nnoremap', ['w', 'd'], \ 'close', 'delete window', 1) call SpaceVim#mapping#space#def('nnoremap', ['w', 'D'], diff --git a/config/general.vim b/config/general.vim index 0717c1b4d..95601d7ea 100644 --- a/config/general.vim +++ b/config/general.vim @@ -15,7 +15,7 @@ if g:spacevim_enable_guicolors == 1 set guicolors endif endif -if SpaceVim#layers#isLoaded('colorscheme') && g:spacevim_colorscheme !=# '' "{{{ +if g:spacevim_colorscheme !=# '' "{{{ try exec 'set background=' . g:spacevim_colorscheme_bg exec 'colorscheme ' . g:spacevim_colorscheme diff --git a/docs/layers/tools.md b/docs/layers/tools.md new file mode 100644 index 000000000..df1061710 --- /dev/null +++ b/docs/layers/tools.md @@ -0,0 +1,30 @@ +--- +title: "SpaceVim tools layer" +description: "This layer provides some tools for vim" +--- + +# [SpaceVim Layers:](https://spacevim.org/layers) tools + + + + +- [Description](#description) +- [Install](#install) +- [Commands](#commands) + + + +## Description + +This layer provides some extra vim tools for SpaceVim. All tools can be +called via command. no key bindings will be definded in this layer. + +## Install + +This layer is disabled by default in SpaceVim. + +To use this configuration layer, add `call SpaceVim#layers#load('tools')` to your custom configuration file. + +## Commands + + diff --git a/ginit.vim b/ginit.vim index 25afac988..9adcf6736 100644 --- a/ginit.vim +++ b/ginit.vim @@ -12,7 +12,7 @@ if exists('g:GuiLoaded') else exe 'Guifont! ' . g:spacevim_guifont endif - if SpaceVim#layers#isLoaded('colorscheme') && g:spacevim_colorscheme !=# '' "{{{ + if g:spacevim_colorscheme !=# '' "{{{ try exec 'set background=' . g:spacevim_colorscheme_bg exec 'colorscheme ' . g:spacevim_colorscheme diff --git a/mode/dark_powered.vim b/mode/dark_powered.vim index 36693b84b..39458d4f4 100644 --- a/mode/dark_powered.vim +++ b/mode/dark_powered.vim @@ -19,24 +19,6 @@ let g:spacevim_enable_debug = 1 " }}} " SpaceVim Layers: {{{ -call SpaceVim#layers#load('incsearch') -call SpaceVim#layers#load('lang#c') -call SpaceVim#layers#load('lang#elixir') -call SpaceVim#layers#load('lang#go') -call SpaceVim#layers#load('lang#haskell') -call SpaceVim#layers#load('lang#java') -call SpaceVim#layers#load('lang#javascript') -call SpaceVim#layers#load('lang#lua') -call SpaceVim#layers#load('lang#perl') -call SpaceVim#layers#load('lang#php') -call SpaceVim#layers#load('lang#python') -call SpaceVim#layers#load('lang#rust') -call SpaceVim#layers#load('lang#swig') -call SpaceVim#layers#load('lang#tmux') -call SpaceVim#layers#load('lang#vim') -call SpaceVim#layers#load('lang#xml') -call SpaceVim#layers#load('shell') -call SpaceVim#layers#load('tools#screensaver') " }}} diff --git a/wiki/en/Following-HEAD.md b/wiki/en/Following-HEAD.md new file mode 100644 index 000000000..016b6489f --- /dev/null +++ b/wiki/en/Following-HEAD.md @@ -0,0 +1,13 @@ +This page documents changes in master branch which may require users to update configuration. + +### PreRelease + +#### Changed + +#### Added + +#### Removed + +### V0.6.0 + +SpaceVim releases v0.6.0 at 2017-12-30, please check the [release page](https://spacevim.org/SpaceVim-release-v0.6.0/) for all the details diff --git a/wiki/en/_Sidebar.md b/wiki/en/_Sidebar.md index 7cd774552..e65206246 100644 --- a/wiki/en/_Sidebar.md +++ b/wiki/en/_Sidebar.md @@ -1,12 +1,13 @@ -[[[https://spacevim.org/logo.png|alt=SpaceVim home]]](Home) +[![SpaceVim home](https://spacevim.org/logo.png)](Home) -- -[Introduction](introduction) +[Introduction](introduction) [Community](community) [FAQ](FAQ) [Layers](https://spacevim.org/layers/) **Users** -[Install](Installing-SpaceVim) +[Install](Installing-SpaceVim) +[Following HEAD](Following-HEAD) [Docs](http://spacevim.org/documentation/) **Developers**