Skip to content

Commit

Permalink
v0.0.2 release
Browse files Browse the repository at this point in the history
1. remove unused plugins.
2. remove ruby features.
3. change the markdown highlight plugin to new one.
  • Loading branch information
D0n9X1n committed Apr 18, 2017
1 parent b9f66b7 commit 48a0fc7
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 67 deletions.
4 changes: 2 additions & 2 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TODO
---
None so far.
1. [ ] Fix the bug when edit markdown files.

Bugs
---
None so far.
1. [ ] When edit the markdown file, the syntax highlight is not current.
2 changes: 1 addition & 1 deletion vimrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"==========================================
" Thanks: k-vim Project
" Author: mike
" Version: 0.0.1
" Version: 0.0.2
" Email: [email protected]
" ReadMe: README.md
" Sections:
Expand Down
112 changes: 48 additions & 64 deletions vimrc.bundles
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ Plug 'kana/vim-textobj-entire'
Plug 'kana/vim-textobj-indent'

" markdown 增强
Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown'
Plug 'gabrielelana/vim-markdown'
Plug 'joker1007/vim-markdown-quote-syntax'

" 1. vim a.go
" 2. :GoInstallBinaries
Expand All @@ -184,39 +184,20 @@ Plug 'hdima/python-syntax'
Plug 'hynek/vim-python-pep8-indent'
Plug 'Glench/Vim-Jinja2-Syntax'

Plug 'vim-ruby/vim-ruby'
Plug 'tpope/vim-rails'
" dir / dar
Plug 'nelstrom/vim-textobj-rubyblock'

" javascript
" 注意: syntax这个插件要放前面
Plug 'othree/yajs.vim' | Plug 'pangloss/vim-javascript'
" Plug 'jelera/vim-javascript-syntax' | Plug 'pangloss/vim-javascript'

Plug 'othree/javascript-libraries-syntax.vim'
let g:used_javascript_libs = 'jquery,underscore,backbone'

" for javascript 自动补全,配合YCM,需要安装nodejs&npm see
" https://github.com/marijnh/tern_for_vim
Plug 'marijnh/tern_for_vim'

" " json
" Plug 'elzr/vim-json', {'for': 'json'}

" ###### vim.less : less 自动更新##########
Plug 'groenewege/vim-less'
autocmd BufWritePost *.less :!lessc % > %:p:r.css

" ###### emmet HTML complete #########
Plug 'mattn/emmet-vim'

Plug 'evanmiller/nginx-vim-syntax'

" Add plugins to &runtimepath
call plug#end()

" ################### 基础 ######################
" syntastic {{{
let g:syntastic_error_symbol='>>'
let g:syntastic_warning_symbol='>'
Expand Down Expand Up @@ -263,12 +244,10 @@ call plug#end()
" 修改高亮的背景色, 适应主题
highlight SyntasticErrorSign guifg=white guibg=black

" 禁止插件检查java
" thanks to @marsqing, see https://github.com/wklken/k-vim/issues/164
let g:syntastic_mode_map = {'mode': 'active', 'passive_filetypes': ['java'] }
let g:syntastic_mode_map = {'mode': 'active', 'passive_filetypes': ['java', 'md', 'mkd'] }
" }}}

" ################### 自动补全 ###################

" YouCompleteMe {{{
"youcompleteme 默认tab s-tab 和自动补全冲突
Expand Down Expand Up @@ -357,7 +336,6 @@ call plug#end()
let g:closetag_html_style=1
" }}}

" ################### 快速编码 ###################

" nerdcommenter {{{
let g:NERDSpaceDelims=1
Expand All @@ -376,7 +354,6 @@ call plug#end()
let g:easy_align_delimiters['#'] = { 'pattern': '#', 'ignore_groups': ['String'] }
" }}}

" ################### 快速移动 ###################

" easymotion {{{
let g:EasyMotion_smartcase = 1
Expand All @@ -399,7 +376,6 @@ call plug#end()
" let g:qs_second_occurrence_highlight_color = 81 " terminal vim
" }}}

" ################### 快速选中 ###################

" expandregion {{{
" map + <Plug>(expand_region_expand)
Expand All @@ -425,8 +401,6 @@ call plug#end()
let g:multi_cursor_quit_key='<Esc>'
" }}}

" ################### 功能相关 ###################

" ctrlp ctrlpfunky{{{
let g:ctrlp_map = '<leader>p'
let g:ctrlp_cmd = 'CtrlP'
Expand All @@ -442,12 +416,12 @@ call plug#end()
let g:ctrlp_mruf_max=500
let g:ctrlp_follow_symlinks=1
" 如果安装了ag, 使用ag
" if executable('ag')
" " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
" let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
" " ag is fast enough that CtrlP doesn't need to cache
" let g:ctrlp_use_caching = 0
" endif
if executable('ag')
" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
" ag is fast enough that CtrlP doesn't need to cache
let g:ctrlp_use_caching = 0
endif

" ctrlpfunky
" ctrlp插件1 - 不用ctag进行函数快速跳转
Expand Down Expand Up @@ -499,7 +473,6 @@ call plug#end()
noremap <leader>h :GundoToggle<CR>
" }}}

" ################### 显示增强 ###################

" airline {{{
if !exists('g:airline_symbols')
Expand All @@ -515,7 +488,6 @@ call plug#end()
" let g:airline#extensions#tabline#enabled = 1
" }}}

" ################### 显示增强-主题 ###################

" solarized {{{
let g:solarized_termtrans=1
Expand All @@ -530,8 +502,6 @@ call plug#end()
let g:rehash256 = 1
" }}}

" ################### 快速导航 ###################

" nerdtree nerdtreetabs {{{
map <leader>n :NERDTreeToggle<CR>
let NERDTreeHighlightCursorline=1
Expand All @@ -542,19 +512,17 @@ call plug#end()
let g:NERDTreeMapOpenSplit = 's'
let g:NERDTreeMapOpenVSplit = 'v'


" nerdtreetabs
map <Leader>n <plug>NERDTreeTabsToggle<CR>
" 关闭同步
let g:nerdtree_tabs_synchronize_view=0
let g:nerdtree_tabs_synchronize_focus=0
let g:nerdtree_tabs_synchronize_view=1
let g:nerdtree_tabs_synchronize_focus=1
" 是否自动开启nerdtree
" thank to @ListenerRi, see https://github.com/wklken/k-vim/issues/165
let g:nerdtree_tabs_open_on_console_startup=0
let g:nerdtree_tabs_open_on_gui_startup=0
let g:nerdtree_tabs_open_on_console_startup=1
let g:nerdtree_tabs_open_on_gui_startup=1
" }}}


" Vim Workspace Controller
" ctrlspace {{{
let g:airline_exclude_preview = 1
Expand Down Expand Up @@ -616,13 +584,11 @@ call plug#end()
\ }
" }}}

" ################### 语言相关 ###################

" pythonsyntax {{{
let python_highlight_all = 1
" }}}


" vimgo {{{
let g:go_highlight_functions = 1
let g:go_highlight_methods = 1
Expand All @@ -638,34 +604,19 @@ call plug#end()
" markdown {{{
let g:vim_markdown_folding_disabled = 0
let g:vim_markdown_conceal = 0
let g:markdown_enable_spell_checking = 0
" }}}


" javascript {{{
" pangloss/vim-javascript
let g:html_indent_inctags = "html,body,head,tbody"
let g:html_indent_script1 = "inc"
let g:html_indent_style1 = "inc"
" }}}

" " json {{{
" let g:vim_json_syntax_conceal = 0
" " }}}

" css {{{
" }}}

" nginx {{{
" }}}


" ag.vim {{{
let g:ag_working_path_mode="r"
map <leader>s :Ag
" }}}

" 终端 {{{
map <leader>t :ConqueTermSplit zsh<cr>
map <leader>s :Ag
" }}}

" indentLine.vim {{{
Expand Down Expand Up @@ -702,4 +653,37 @@ call plug#end()
map <leader>m :MarkdownPreview github<CR>
" }}}

" markdown_quote_syntax {{{
" Add syntax rule
let g:markdown_quote_syntax_filetypes = {
\ "javascript" : {
\ "start" : "javascript",
\},
\ "css" : {
\ "start" : "\\%(css\\|scss\\)",
\},
\ "ruby" : {
\ "start" : "ruby",
\},
\ "cpp" : {
\ "start" : "cpp",
\},
\}

" 'start' and 'end' is vim regular expression.
" need to care backslash.

" Each codeblock is defined as:
"
" 'codeblock[0].filetype.codeblock[1]<code lines>codeblock[2]'
"
" Above example is for the liquid highlight tag. (It is already included by default.)
" {% highlight vim %}
" any codes
" ...
" {% endhighlight %}

" Add other file types in which quote syntax should be on.
let g:markdown_quote_syntax_on_filetypes = ['text']
" }}}
"------------------------------------------- end of configs --------------------------------------------

0 comments on commit 48a0fc7

Please sign in to comment.