Merge branches 'master' and 'master' of https://github.com/edthedev/dotfiles

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 3cd27978ead912402fd0b57832f7ed0b31bb3467..3e91fed92faf0655dfb58c554e20548703b5a041 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -46,8 +46,7 @@ call vundle#begin()
 Plugin 'gmarik/vundle'
 
 " Helper scripts for editing ReStructuredText
-" Plugin 'edthedev/vim-rst'
-Plugin 'edthedev/text-helper.vim'
+" Plugin 'edthedev/text-helper.vim'
 
 " EdTheDev's Minion file organizer.
 Plugin 'edthedev/minion'
@@ -130,7 +129,7 @@ let g:PyLintOnWrite = 1
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913'
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913,E1002,E1103'
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1002,E1101,E1103,E1120,R0201,R0901,R0903,R0904,R0913'
-let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
+let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
 
 Plugin 'edthedev/arduino.vim'
 " Plugin 'edthedev/vim-arduino-ino'
@@ -146,9 +145,10 @@ Plugin 'itchyny/thumbnail.vim'
 " :Thumbnail
 "
 " Plugin 'farseer90718/vim-taskwarrior'
+" let g:task_rc_override = 'defaultwidth=999'
+" Plugin 'farseer90718/vim-taskwarrior'
 " let g:task_rc_override = 'defaultwidth=0'
 " let g:task_report_name     = 'list'
-" let g:task_rc_override = 'defaultwidth=999'
 " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
 "
 
@@ -171,6 +171,11 @@ Plugin 'Shougo/unite.vim'
 " Better status line.
 Plugin 'bling/vim-airline'
 
+Plugin 'vimwiki/vimwiki'
+let g:vimwiki_list = [{'path': '~/Box Sync/wiki', 'path_html': '~/cites_wiki_html/'},{'path': '~/Dropbox/wiki', 'path_html': '~/vim_wiki_html/'}]
+
+# Emacs style kill-paste ring
+Plugin 'vim-scripts/YankRing.vim'
 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
@@ -182,6 +187,7 @@ nn <S-space> <c-u>
 
 " Don't show tabs for HTML files. Do show trailing spaces."
 au FileType html set nolist
+au FileType javascript set nolist
 
 " Two spaces as tabs in .feature files.
 au BufRead,BufNewFile *.feature set filetype=yaml