diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim index a5b02f653..5d65124b7 100644 --- a/autoload/SpaceVim/layers/edit.vim +++ b/autoload/SpaceVim/layers/edit.vim @@ -3,6 +3,12 @@ function! SpaceVim#layers#edit#plugins() abort \ ['tpope/vim-surround'], \ ['terryma/vim-multiple-cursors'], \ ['scrooloose/nerdcommenter'], + \ ['mattn/emmet-vim', { 'on_cmd' : 'EmmetInstall'}], + \ ['gcmt/wildfire.vim',{'on_map' : '(wildfire-'}], + \ ['easymotion/vim-easymotion',{'on_map' : '(easymotion-prefix)'}], + \ ['editorconfig/editorconfig-vim', { 'on_cmd' : 'EditorConfigReload'}], + \ ['floobits/floobits-neovim', { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}], + \ ['lilydjwg/fcitx.vim', { 'on_i' : 1}], \ ] endfunction @@ -11,4 +17,16 @@ function! SpaceVim#layers#edit#config() abort let g:multi_cursor_prev_key='' let g:multi_cursor_skip_key='' let g:multi_cursor_quit_key='' + let g:user_emmet_install_global = 0 + let g:user_emmet_leader_key='' + let g:user_emmet_mode='a' + let g:user_emmet_settings = { + \ 'jsp' : { + \ 'extends' : 'html', + \ }, + \} + noremap (wildfire-fuel) + vnoremap (wildfire-water) + let g:wildfire_objects = ["i'", 'i"', 'i)', 'i]', 'i}', 'ip', 'it'] + map (easymotion-prefix) endfunction diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim index c35f60bd9..37d0af92d 100644 --- a/autoload/SpaceVim/layers/tools.vim +++ b/autoload/SpaceVim/layers/tools.vim @@ -23,6 +23,13 @@ function! SpaceVim#layers#tools#plugins() abort \ ['itchyny/calendar.vim', { 'on_cmd' : 'Calendar'}], \ ['wsdjeg/Mysql.vim', { 'on_cmd' : 'SQLGetConnection'}], \ ['wsdjeg/job.vim', { 'merged' : 0}], + \ ['junegunn/fzf', { 'on_cmd' : 'FZF'}], + \ ['ianva/vim-youdao-translater', { 'on_cmd' : ['Ydv','Ydc','Yde']}], + \ ['TaskList.vim', { 'on_cmd' : 'TaskList'}], + \ ['MarcWeber/vim-addon-mw-utils'], + \ ['taglist.vim',{'on_cmd' : 'TlistToggle', 'loadconf' : 1}], + \ ['scrooloose/nerdtree',{'on_cmd' : 'NERDTreeToggle', 'loadconf' : 1}], + \ ['Xuyuanp/nerdtree-git-plugin'], \ ] endfunction @@ -36,4 +43,21 @@ function! SpaceVim#layers#tools#config() abort let g:rainbow#pairs = [['(', ')'], ['[', ']'],['{','}']] " List of colors that you do not want. ANSI code or #RRGGBB let g:rainbow#blacklist = [233, 234] + nnoremap fz :FZF + vnoremap :Ydv + nnoremap :Ydc + map td TaskList + noremap :TlistToggle + function! OpenOrCloseNERDTree() abort + exec 'normal! A' + endfunction + noremap :NERDTreeToggle + let g:NERDTreeWinPos='right' + let g:NERDTreeWinSize=31 + let g:NERDTreeChDirMode=1 + autocmd bufenter * if (winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree()) | q | endif + augroup nerdtree_zvim + autocmd! + autocmd FileType nerdtree nnoremap :call OpenOrCloseNERDTree() + augroup END endfunction diff --git a/autoload/SpaceVim/layers/ui.vim b/autoload/SpaceVim/layers/ui.vim index b6aa4c018..c9344897f 100644 --- a/autoload/SpaceVim/layers/ui.vim +++ b/autoload/SpaceVim/layers/ui.vim @@ -4,6 +4,9 @@ function! SpaceVim#layers#ui#plugins() abort \ ['Yggdroot/indentLine'], \ ['mhinz/vim-signify'], \ ['majutsushi/tagbar', {'loadconf' : 1}], + \ ['vim-airline/vim-airline', { 'merged' : 0, 'loadconf' : 1}], + \ ['vim-airline/vim-airline-themes', { 'merged' : 0}], + \ ['mhinz/vim-startify', {'loadconf' : 1}], \ ] endfunction diff --git a/autoload/SpaceVim/plugins.vim b/autoload/SpaceVim/plugins.vim index 0c78fe54e..687c87bd4 100644 --- a/autoload/SpaceVim/plugins.vim +++ b/autoload/SpaceVim/plugins.vim @@ -4,81 +4,7 @@ function! SpaceVim#plugins#load() abort call zvim#plug#begin(g:spacevim_plugin_bundle_dir) call zvim#plug#fetch() call s:load_plugins() - - - - "web plugins - - call zvim#plug#add('vim-airline/vim-airline', { 'merged' : 0}) - call zvim#plug#add('vim-airline/vim-airline-themes', { 'merged' : 0}) - if zvim#plug#tap('vim-airline') - call zvim#plug#defind_hooks('vim-airline') - endif - call zvim#plug#add('mattn/emmet-vim', { 'on_cmd' : 'EmmetInstall'}) - let g:user_emmet_install_global = 0 - let g:user_emmet_leader_key='' - let g:user_emmet_mode='a' - let g:user_emmet_settings = { - \ 'jsp' : { - \ 'extends' : 'html', - \ }, - \} - " use this two command to find how long the plugin take! - "profile start vim-javacomplete2.log - "profile! file */vim-javacomplete2/* - call zvim#plug#add('gcmt/wildfire.vim',{'on_map' : '(wildfire-'}) - noremap (wildfire-fuel) - vnoremap (wildfire-water) - let g:wildfire_objects = ["i'", 'i"', 'i)', 'i]', 'i}', 'ip', 'it'] - - call zvim#plug#add('easymotion/vim-easymotion',{'on_map' : '(easymotion-prefix)'}) - if zvim#plug#tap('vim-easymotion') - map (easymotion-prefix) - endif - - call zvim#plug#add('MarcWeber/vim-addon-mw-utils') - call zvim#plug#add('mhinz/vim-startify') - if zvim#plug#tap('vim-startify') - call zvim#plug#defind_hooks('vim-startify') - endif - call zvim#plug#add('lilydjwg/fcitx.vim', { 'on_i' : 1}) - "vim Wimdows config - call zvim#plug#add('scrooloose/nerdtree',{'on_cmd':'NERDTreeToggle'}) - if zvim#plug#tap('nerdtree') - call zvim#plug#defind_hooks('nerdtree') - function! OpenOrCloseNERDTree() abort - exec 'normal! A' - endfunction - noremap :NERDTreeToggle - let g:NERDTreeWinPos='right' - let g:NERDTreeWinSize=31 - let g:NERDTreeChDirMode=1 - autocmd bufenter * if (winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree()) | q | endif - augroup nerdtree_zvim - autocmd! - autocmd FileType nerdtree nnoremap :call OpenOrCloseNERDTree() - augroup END - endif - call zvim#plug#add('Xuyuanp/nerdtree-git-plugin') - call zvim#plug#add('taglist.vim',{'on_cmd' : 'TlistToggle'}) - if zvim#plug#tap('taglist.vim') - call zvim#plug#defind_hooks('taglist.vim') - noremap :TlistToggle - endif - "}}} - - call zvim#plug#add('floobits/floobits-neovim', { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}) - call zvim#plug#add('TaskList.vim', { 'on_cmd' : 'TaskList'}) - map td TaskList - call zvim#plug#add('ianva/vim-youdao-translater', { 'on_cmd' : ['Ydv','Ydc','Yde']}) - vnoremap :Ydv - nnoremap :Ydc - call zvim#plug#add('editorconfig/editorconfig-vim', { 'on_cmd' : 'EditorConfigReload'}) - call zvim#plug#add('junegunn/fzf', { 'on_cmd' : 'FZF'}) - nnoremap fz :FZF - call s:disable_plugins(g:spacevim_disabled_plugins) - call zvim#plug#end() endif