Merge branch 'master' of https://github.com/SpaceVim/SpaceVim into tmux_docs

2025-04-15 08:09:11 +08:00 · 2017-02-21 16:29:51 -05:00 · 2017-02-21 16:29:51 -05:00 · cc55d125a0
commit cc55d125a0
parent 2dbd249963 0860871a17
23 changed files with 200 additions and 97 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,4 +7,6 @@ doc/tags
 *-rplugin~
 *rplugin.vim
 /config/local.vim
-.SpaceVim.log
+.SpaceVim.logA
+docs/_site/*
+docs/Gemfile.lock
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/docs/logo.png" alt="SpaceVim"/></p>
+<p align="center"><img src="https://spacevim.org/logo.png" alt="SpaceVim"/></p>

 [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
 ![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)
@ -21,7 +21,7 @@
        - [go support](#go-support)
        - lua support
        - perl support
-        - php support
+        - [php support](#php-support)
        - rust support
    - [Unite centric work-flow](#unite-centric-work-flow)
    - [Neovim centric - Dark powered mode](#neovim-centric---dark-powered-mode-of-spacevim)
@ -108,19 +108,20 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 ```

 #### File Structure
+- [autoload/](./autoload)
+    - [SpaceVim.vim](./autoload/SpaceVim.vim) - SpaceVim options init
+    - [SpaceVim/layers](./autoload/SpaceVim/layers) - SpaceVim layers
+    - [SpaceVim/api](./autoload/SpaceVim/api) - SpaceVim apis
+    - [SpaceVim/default.vim](./autoload/SpaceVim/default.vim) - SpaceVim default status
 - [config](./config)/ - Configuration
-  - [plugins](./config/plugins)/ - Plugin configurations
-  - [mappings.vim](./config/mappings.vim) - Key mappings
-  - [autocmds.vim](./config/autocmds.vim) - autocmd group
  - [general.vim](./config/general.vim) - General configuration
  - [init.vim](./config/init.vim) - `runtimepath` initialization
  - [neovim.vim](./config/neovim.vim) - Neovim specific setup
-  - [plugins.vim](./config/plugins.vim) - Plugin bundles
  - [commands.vim](./config/commands.vim) - Commands
  - [functions.vim](./config/functions.vim) - Functions
  - [main.vim](./config/main.vim) - Main config
 - [ftplugin](./ftplugin)/ - Language specific custom settings
- [snippets](../../snippets)/ - Code snippets
+- [snippets](./snippets)/ - Code snippets
 - [filetype.vim](./filetype.vim) - Custom filetype detection
 - [init.vim](./init.vim) - Sources `config/main.vim`
 - [vimrc](./vimrc) - Sources `config/main.vim`
@ -154,6 +155,10 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 2. syntax check:
    ![2017-02-02_1358x720](https://cloud.githubusercontent.com/assets/13142418/22537883/36de7b5e-e949-11e6-866f-73c48e8f59aa.png)

+###### php support
+1. code completion:
+    [![asciicast](https://asciinema.org/a/4dzyyjymrguylqt21igxlhhqx.png)](https://asciinema.org/a/4dzyyjymrguylqt21igxlhhqx)
+
 ##### Neovim centric - Dark powered mode of SpaceVim.

 By default, SpaceVim use these dark powered plugins:
@ -294,8 +299,8 @@ Name           | Description
 [javascript-indent] | Javascript indent script
 [tern] | Provides Tern-based JavaScript editing support
 [php] | Up-to-date PHP syntax file
+[phpcd] | PHP Completion Daemon for Vim/NeoVim
 [phpfold] | PHP folding
-[phpcomplete] | Improved PHP omnicompletion
 [phpindent] | PHP official indenting
 [phpspec] | PhpSpec integration

@ -674,8 +679,8 @@ If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is usefu
 [javascript-indent]: https://github.com/jiangmiao/simple-javascript-indenter
 [tern]: https://github.com/marijnh/tern_for_vim
 [php]: https://github.com/StanAngeloff/php.vim
-[phpfold]: https://github.com/rayburgemeestre/phpfolding.vim
-[phpcomplete]: https://github.com/shawncplus/phpcomplete.vim
+[phpfold]: https://github.com/lvht/phpfold.vim
+[phpcd]: https://github.com/lvht/phpcd.vim
 [phpindent]: https://github.com/2072/PHP-Indenting-for-VIm
 [phpspec]: https://github.com/rafi/vim-phpspec
 [vimfiler]: https://github.com/Shougo/vimfiler.vim
--- a/autoload/SpaceVim/api/data/string.vim
+++ b/autoload/SpaceVim/api/data/string.vim
@ -0,0 +1,27 @@
+let s:file = {}
+
+function! s:trim(str) abort
+    let str = substitute(a:str, '\s*$', '', 'g')
+    return substitute(str, '^\s*', '', 'g')
+endfunction
+
+let s:file['trim'] = function('s:trim')
+
+function! s:trim_start(str) abort
+    return substitute(a:str, '^\s*', '', 'g')
+endfunction
+
+let s:file['trim_start'] = function('s:trim_start')
+
+function! s:trim_end(str) abort
+    return substitute(a:str, '\s*$', '', 'g')
+endfunction
+
+let s:file['trim_end'] = function('s:trim_end')
+
+function! SpaceVim#api#data#string#get() abort
+    return deepcopy(s:file)
+endfunction
+
+
+
--- a/autoload/SpaceVim/autocmds.vim
+++ b/autoload/SpaceVim/autocmds.vim
@ -34,7 +34,6 @@ function! SpaceVim#autocmds#init() abort
        autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
        autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
        autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
-        autocmd FileType php setlocal omnifunc=phpcomplete_extended#CompletePHP
        autocmd BufEnter *
                    \   if empty(&buftype) && has('nvim') && &filetype != 'help'
                    \|      nnoremap <silent><buffer> <C-]> :call MyTagfunc()<CR>
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@ -94,7 +94,6 @@ function! SpaceVim#default#SetOptions() abort
    set laststatus=2
    set completeopt=longest,menu
    set wildignorecase
-    let g:markdown_fenced_languages = ['vim', 'java', 'bash=sh', 'sh', 'html', 'python']
    set mouse=
    set hidden
    set ttimeout
@ -118,6 +117,7 @@ function! SpaceVim#default#SetPlugins() abort
    call add(g:spacevim_plugin_groups, 'python')
    call add(g:spacevim_plugin_groups, 'scala')
    call add(g:spacevim_plugin_groups, 'lang#go')
+    call add(g:spacevim_plugin_groups, 'lang#markdown')
    call add(g:spacevim_plugin_groups, 'scm')
    call add(g:spacevim_plugin_groups, 'editing')
    call add(g:spacevim_plugin_groups, 'indents')
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@ -1,7 +1,6 @@
 function! SpaceVim#layers#lang#plugins() abort
    let plugins = [
                \ ['Shougo/neosnippet.vim',                  { 'on_i'  : 1 , 'on_ft' : 'neosnippet', 'loadconf' : 1, 'on_cmd' : 'NeoSnippetEdit'}],
-                \ ['m2mdas/phpcomplete-extended',            { 'on_ft' : 'php'}],
                \ ['groenewege/vim-less',                    { 'on_ft' : ['less']}],
                \ ['cakebaker/scss-syntax.vim',              { 'on_ft' : ['scss','sass']}],
                \ ['hail2u/vim-css3-syntax',                 { 'on_ft' : ['css','scss','sass']}],
@ -16,7 +15,6 @@ function! SpaceVim#layers#lang#plugins() abort
                \ ['syngan/vim-vimlint',                     { 'on_ft' : 'vim'}],
                \ ['ynkdir/vim-vimlparser',                  { 'on_ft' : 'vim'}],
                \ ['todesking/vint-syntastic',               { 'on_ft' : 'vim'}],
-                \ ['plasticboy/vim-markdown',                { 'on_ft' : 'markdown'}],
                \ ['elixir-lang/vim-elixir',                 { 'on_ft' : 'elixir'}],
                \ ['PotatoesMaster/i3-vim-syntax',           { 'on_ft' : 'i3'}],
                \ ['isundil/vim-irssi-syntax',               { 'on_ft' : 'irssi'}],
@ -28,6 +26,4 @@ function! SpaceVim#layers#lang#plugins() abort
 endfunction

 function! SpaceVim#layers#lang#config() abort
-    let g:vim_markdown_conceal = 0
-    let g:vim_markdown_folding_disabled = 1
 endfunction
--- a/autoload/SpaceVim/layers/lang/markdown.vim
+++ b/autoload/SpaceVim/layers/lang/markdown.vim
@ -0,0 +1,13 @@
+function! SpaceVim#layers#lang#markdown#plugins() abort
+    let plugins = []
+    call add(plugins, ['plasticboy/vim-markdown',{ 'on_ft' : 'markdown'}])
+    call add(plugins, ['iamcco/mathjax-support-for-mkdp',{ 'on_ft' : 'markdown'}])
+    call add(plugins, ['iamcco/markdown-preview.vim',{ 'on_ft' : 'markdown'}])
+    return plugins
+endfunction
+
+function! SpaceVim#layers#lang#markdown#config() abort
+    let g:vim_markdown_conceal = 0
+    let g:vim_markdown_folding_disabled = 1
+    let g:markdown_fenced_languages = ['vim', 'java', 'bash=sh', 'sh', 'html', 'python']
+endfunction
--- a/autoload/SpaceVim/layers/lang/php.vim
+++ b/autoload/SpaceVim/layers/lang/php.vim
@ -18,6 +18,10 @@
 function! SpaceVim#layers#lang#php#plugins() abort
    let plugins = []
    call add(plugins, ['php-vim/phpcd.vim', { 'on_ft' : 'php'}])
+    call add(plugins, ['StanAngeloff/php.vim', { 'on_ft' : 'php'}])
+    call add(plugins, ['2072/PHP-Indenting-for-VIm', { 'on_ft' : 'php'}])
+    call add(plugins, ['rafi/vim-phpspec', { 'on_ft' : 'php'}])
+    call add(plugins, ['lvht/phpfold.vim', { 'on_ft' : 'php'}])
    return plugins
 endfunction

--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@ -9,7 +9,6 @@ function! SpaceVim#layers#tools#plugins() abort
                \ ['MattesGroeger/vim-bookmarks', { 'on_map' : '<Plug>Bookmark', 'loadconf_before' : 1}],
                \ ['google/vim-searchindex'],
                \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
-                \ ['wsdjeg/MarkDown.pl',            { 'on_cmd' : 'MarkDownPreview'}],
                \ ['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'}],
--- a/autoload/SpaceVim/mapping.vim
+++ b/autoload/SpaceVim/mapping.vim
@ -64,3 +64,14 @@ function! SpaceVim#mapping#gd() abort
        normal! gd
    endif
 endfunction
+
+function! SpaceVim#mapping#clearBuffers() abort
+    for i in range(1,bufnr('$'))
+        if i != bufnr('%')
+            try 
+                exe 'bw ' . i
+            catch
+            endtry
+        endif
+    endfor
+endfunction
--- a/autoload/SpaceVim/mapping/leader.vim
+++ b/autoload/SpaceVim/mapping/leader.vim
@ -86,6 +86,9 @@ function! SpaceVim#mapping#leader#defindWindowsLeader(key) abort
                    \'Empty current buffer','call zvim#util#BufferEmpty()')
        call zvim#util#defineMap('nnoremap <silent>', '[Window]\', ':<C-u>b#<CR>', 'Switch to the last buffer','b#')
        call zvim#util#defineMap('nnoremap <silent>', '[Window]q', ':<C-u>close<CR>', 'Close current windows','close')
+        call zvim#util#defineMap('nnoremap <silent>', '[Window]Q', ':<C-u>bdelete<CR>', 'delete current windows','bdelete')
+        call zvim#util#defineMap('nnoremap <silent>', '[Window]c', ':<C-u>call SpaceVim#mapping#clearBuffers()<CR>',
+                    \'Clear all the buffers','call SpaceVim#mapping#clearBuffers()')
    endif
 endfunction

--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@ -1,3 +1,4 @@
+" deoplete options
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#enable_ignore_case = 1
 let g:deoplete#enable_smart_case = 1
@ -5,32 +6,18 @@ let g:deoplete#enable_camel_case = 1
 let g:deoplete#enable_refresh_always = 1
 let g:deoplete#max_abbr_width = 0
 let g:deoplete#max_menu_width = 0
+" init deoplet option dict
+let g:deoplete#ignore_sources = get(g:,'deoplete#ignore_sources',{})
 let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
+let g:deoplete#omni_patterns = get(g:, 'deoplete#omni_patterns', {})
+
+" java && jsp
 let g:deoplete#omni#input_patterns.java = [
            \'[^. \t0-9]\.\w*',
            \'[^. \t0-9]\->\w*',
            \'[^. \t0-9]\::\w*',
            \]
-let g:deoplete#omni#input_patterns.perl = [
-            \'[^. \t0-9]\.\w*',
-            \'[^. \t0-9]\->\w*',
-            \'[^. \t0-9]\::\w*',
-            \]
 let g:deoplete#omni#input_patterns.jsp = ['[^. \t0-9]\.\w*']
-let g:deoplete#omni#input_patterns.javascript = ['[^. \t0-9]\.\w*']
-let g:deoplete#omni#input_patterns.php = '\h\w*\|[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?'
-let g:deoplete#omni_patterns = get(g:, 'deoplete#omni_patterns', {})
-let g:deoplete#omni_patterns.php = '->\|::'
-let g:deoplete#omni_patterns.lua = '.'
-let g:deoplete#ignore_sources = {}
-let g:deoplete#ignore_sources.go = ['omni']
-let g:deoplete#ignore_sources.c = ['omni']
-let g:deoplete#ignore_sources.rust = ['omni']
-let g:deoplete#ignore_sources.perl = ['omni']
-call deoplete#custom#set('go', 'mark', '')
-call deoplete#custom#set('go', 'rank', 9999)
-call deoplete#custom#set('clang2', 'mark', '')
-call deoplete#custom#set('racer', 'mark', '')
 if g:spacevim_enable_javacomplete2_py
    let g:deoplete#ignore_sources.java = ['omni']
    call deoplete#custom#set('javacomplete2', 'mark', '')
@ -38,9 +25,46 @@ else
    let g:deoplete#ignore_sources.java = ['javacomplete2']
    call deoplete#custom#set('omni', 'mark', '')
 endif
+
+" go
+let g:deoplete#ignore_sources.go = ['omni']
+call deoplete#custom#set('go', 'mark', '')
+call deoplete#custom#set('go', 'rank', 9999)
+
+" perl
+let g:deoplete#omni#input_patterns.perl = [
+            \'[^. \t0-9]\.\w*',
+            \'[^. \t0-9]\->\w*',
+            \'[^. \t0-9]\::\w*',
+            \]
+
+" javascript
+let g:deoplete#omni#input_patterns.javascript = ['[^. \t0-9]\.\w*']
+
+" php
+let g:deoplete#omni#input_patterns.php = [
+            \'[^. \t0-9]\.\w*',
+            \'[^. \t0-9]\->\w*',
+            \'[^. \t0-9]\::\w*',
+            \]
+let g:deoplete#ignore_sources.php = ['omni', 'around', 'member']
+call deoplete#custom#set('phpcd', 'mark', '')
+call deoplete#custom#set('phpcd', 'input_pattern', '\w*|[^. \t]->\w*|\w*::\w*')
+
+" lua
+let g:deoplete#omni_patterns.lua = '.'
+
+" c c++
+call deoplete#custom#set('clang2', 'mark', '')
+let g:deoplete#ignore_sources.c = ['omni']
+
+" rust
+let g:deoplete#ignore_sources.rust = ['omni']
+call deoplete#custom#set('racer', 'mark', '')
+
+" public settings
 call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy'])
 let g:deoplete#ignore_sources._ = ['around']
-"call deoplete#custom#set('omni', 'min_pattern_length', 0)
 inoremap <expr><C-h> deoplete#mappings#smart_close_popup()."\<C-h>"
 inoremap <expr><BS> deoplete#mappings#smart_close_popup()."\<C-h>"
 set isfname-==
--- a/config/plugins/tagbar.vim
+++ b/config/plugins/tagbar.vim
@ -1,5 +1,7 @@
 let g:tagbar_width = g:spacevim_sidebar_width
 let g:tagbar_left = 1
+let g:tagbar_sort = 0
+let g:tagbar_compact = 1


 let g:tagbar_type_markdown = {
--- a/docs/Gemfile
+++ b/docs/Gemfile
@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll-redirect-from', group: :jekyll_plugins
--- a/docs/_config.yml
+++ b/docs/_config.yml
@ -4,3 +4,9 @@ description: A community-driven Vim distribution
 show_downloads: false
 google_analytics: UA-89745542-1
 project_repo_url: https://github.com/SpaceVim/SpaceVim
+url: https://spacevim.org
+
+permalink: /:title/
+
+gems:
+  - jekyll-redirect-from
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@ -21,19 +21,19 @@
        </script>
        <script>
            var _hmt = _hmt || [];
-(function() {
-    var hm = document.createElement("script");
-    hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
-    var s = document.getElementsByTagName("script")[0]; 
-    s.parentNode.insertBefore(hm, s);
-})();
+            (function() {
+                var hm = document.createElement("script");
+                hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
+                var s = document.getElementsByTagName("script")[0]; 
+                s.parentNode.insertBefore(hm, s);
+            })();
        </script>
        <script type="text/javascript" src="http://tajs.qq.com/stats?sId=60680063" charset="UTF-8"></script> 
        <!-- Google Tag Manager -->
        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-                j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-                'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+            'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
        })(window,document,'script','dataLayer','GTM-PCLWNCD');
        </script>
        <!-- End Google Tag Manager -->
@ -71,17 +71,9 @@
                height="0" width="0" style="display:none;visibility:hidden"></iframe>
        </noscript>
        <!-- End Google Tag Manager (noscript) -->
-        <div id="header">
-            <nav>
-                <li class="fork"><a href="{{ site.project_repo_url }}">View On GitHub</a></li>
-                {% if site.show_downloads %}
-                <li class="downloads"><a href="{{ site.github.zip_url }}">ZIP</a></li>
-                <li class="downloads"><a href="{{ site.github.tar_url }}">TAR</a></li>
-                <li class="title">DOWNLOADS</li>
-                {% endif %}
-            </nav>
-        </div><!-- end header -->
-
+        <a href="https://github.com/SpaceVim/SpaceVim">
+            <img alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" style="position: absolute; top: 0; right: 0; border: 0;"/>
+        </a>
        <div class="wrapper">

            <section>
@ -90,12 +82,13 @@
                    <p>{{ site.description | default: site.github.project_tagline }}</p>
                    <hr>
                    <p align="center">
-                        <b><a href="https://spacevim.org">Home</a></b> |
-                        <b><a href="https://spacevim.org/about">about</a></b> |
-                        <b><a href="https://spacevim.org/development">Development</a></b> |
-                        <b><a href="https://spacevim.org/community">Community</a></b> |
-                        <b><a href="https://spacevim.org/documentation">Documentation</a></b> |
-                        <b><a href="https://spacevim.org/sponsors">Sponsors</a></b>
+                        <b><a href="{{ site.url }}">Home</a></b> |
+                        <b><a href="{{ site.url }}/about">about</a></b> |
+                        <b><a href="{{ site.url }}/development">Development</a></b> |
+                        <b><a href="{{ site.url }}/community">Community</a></b> |
+                        <b><a href="{{ site.url }}/documentation">Documentation</a></b> |
+                        <b><a href="{{ site.url }}/blog">Blog</a></b> |
+                        <b><a href="{{ site.url }}/sponsors">Sponsors</a></b>
                    </p>
                    <hr>
                </div>
@ -109,7 +102,7 @@
        {% if site.google_analytics %}
        <script type="text/javascript">
            var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+            document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
        </script>
        <script type="text/javascript">
            try {
--- a/docs/_posts/2017-01-26-SpaceVim-release-v0.1.0.md
+++ b/docs/_posts/2017-01-26-SpaceVim-release-v0.1.0.md
@ -1,5 +1,7 @@
 ---
+title: SpaceVim release v0.1.0
 categories: changelog
+excerpt: "Here you can check what has been done so far."
 ---

 # [Changelogs](https://spacevim.org/development#changelog) > SpaceVim release v0.1.0
--- a/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md
+++ b/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md
@ -1,3 +1,10 @@
+---
+title: "Use Vim as a Java IDE"
+categories: tutorials
+excerpt: "I am a vimmer and a java developer. Here are some useful plugins for developing java in vim/neovim."
+redirect_from: "/2017/02/11/use-vim-as-a-java-ide.html"
+---
+
 # [Blogs](https://spacevim.org/community#blogs) > Use Vim as a Java IDE

 I am a vimmer and a java developer. Here are some useful plugins for developing java in vim/neovim.
--- a/docs/_posts/2017-02-20-install-vim-or-neovim-with-python-support.md
+++ b/docs/_posts/2017-02-20-install-vim-or-neovim-with-python-support.md
@ -0,0 +1,12 @@
+---
+title: "Install vim/neovim with python support"
+categories: tutorials
+excerpt: "How to build vim or neovim from source with python enabled?"
+---
+
+
+Installation of neovim/vim with python support:
+
+> [neovim installation](https://github.com/neovim/neovim/wiki/Installing-Neovim)
+
+> [Building Vim from source](https://github.com/Valloric/YouCompleteMe/wiki/Building-Vim-from-source)
--- a/docs/blog.md
+++ b/docs/blog.md
@ -0,0 +1,18 @@
+---
+title: "Blog"
+---
+
+# Blog
+
+Here you can learn more about SpaceVim with our tutorials and find out what's
+going on. 
+
+<ul>
+    {% for post in site.posts %}
+            <li>
+               <h2><a href="{{ post.url }}">{{ post.title }}</a></h2>
+               <span class="post-date">{{ post.date | date_to_string }}</span>
+               <h4>{{ post.excerpt | truncatewords: 100 }}</h4>
+            </li>
+    {% endfor %}
+</ul>
--- a/docs/blogs.md
+++ b/docs/blogs.md
--- a/docs/community.md
+++ b/docs/community.md
@ -19,16 +19,3 @@ Try these SpaceVim hangouts for any questions, problems or comments.
 ## Discuss

 To report an issue or give feedback to the developers, please use the [issue tracker](https://github.com/SpaceVim/SpaceVim/issues). 
-
-## Blogs
-
-<ul>
-    {% for post in site.posts %}
-        {% if post.categories contains "changelog" %}
-        {% else %}
-            <li>
-                <a href="{{ post.url }}">{{ post.title }}</a>
-            </li>
-        {% endif %}
-    {% endfor %}
-</ul>
--- a/docs/index.md
+++ b/docs/index.md
@ -4,48 +4,38 @@ title:  "Home"

 # Introduction

-
 [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
-![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)
+![Version 0.2.0-dev](https://img.shields.io/badge/version-0.2.0--dev-yellow.svg?style=flat-square)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/LICENSE)
 [![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg?style=flat-square)](https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/doc/SpaceVim.txt)

-![2017-02-05_1359x721](https://cloud.githubusercontent.com/assets/13142418/22622826/f88881a8-eb80-11e6-880b-b12e0430689a.png)
-
-[SpaceVim](https://github.com/SpaceVim/SpaceVim) is a Modular configuration, a bundle of custom settings and plugins for Vim,
-here we call them layers, each layer has different plugins and config, users just need
+[SpaceVim](https://github.com/SpaceVim/SpaceVim) is a modular configuration for neovim and vim, 
+here we call all of the modules layers, each layer has different plugins and config, users just need
 to select the layers they need. It got inspired by [spacemacs](https://github.com/syl20bnr/spacemacs). If you use SpaceVim,
 please star it on github. It's a great way of getting feedback and gives me the kick to
 put more time into development.

-If you encounter any bugs or have feature requests, just open an issue
-report on Github.
+![2017-02-05_1359x721](https://cloud.githubusercontent.com/assets/13142418/22622826/f88881a8-eb80-11e6-880b-b12e0430689a.png)

-For learning about Vim in general, read [vim-galore](https://github.com/mhinz/vim-galore).
+If you are new to vim, you should learning about Vim in general, read [vim-galore](https://github.com/mhinz/vim-galore).

-[![Throughput Graph](https://graphs.waffle.io/SpaceVim/SpaceVim/throughput.svg)](https://waffle.io/SpaceVim/SpaceVim/metrics/throughput)
+## Install

-# Install
+### Linux/Mac

-## Linux/Mac
+If you are using linux or mac os, it is recommenced to use this command to install SpaceVim:

 ```sh
 curl -sLf https://spacevim.org/install.sh | bash
 ```
-before use SpaceVim, you should install the plugin by `call dein#install()`
-
-Installation of neovim/vim with python support:
-> [neovim installation](https://github.com/neovim/neovim/wiki/Installing-Neovim)
-
-> [Building Vim from source](https://github.com/Valloric/YouCompleteMe/wiki/Building-Vim-from-source)
-
+with this command, SpaceVim will be installed. all the plugins will be install automatically when first time run vim/nvim.
 for more info about the install script, please check:

 ```sh
 curl -sLf https://spacevim.org/install.sh | bash -s -- -h
 ```

-## windows support
+### windows support

 - For vim in windows, please just clone this repo as vimfiles in you Home directory.
    by default, when open a cmd, the current dir is your Home directory, run this command in cmd.