Updated bootstrap for WSL

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 9661d67ed881c8efd5fa9f27e69a3ca8cc148aa8..58da9f85d6e2724f6b2e2be4da4d26f5db79a8b3 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -103,6 +103,11 @@ nmap <leader>r :NERDTreeToggle<CR>
 " Async dispatch by Tim Pope
 Plugin 'tpope/vim-dispatch'
 
 " Async dispatch by Tim Pope
 Plugin 'tpope/vim-dispatch'
 

+" Markdown highlighting
+Plugin 'tpope/vim-markdown'
+let g:markdown_github_languages = ['sh', 'python']
+
+

 " Bundle 'vim-scripts/confluencewiki.vim'
 "  - Caused syntax color problems for RST?
 "
 " Bundle 'vim-scripts/confluencewiki.vim'
 "  - Caused syntax color problems for RST?
 "


@@ -132,7 +137,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,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,E0611,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,E0102,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'

 
 " Help building Arduino source files.
 Plugin 'edthedev/arduino.vim'
 
 " Help building Arduino source files.
 Plugin 'edthedev/arduino.vim'


@@ -202,6 +207,27 @@ Plugin 'bling/vim-airline'
 " Very broken:
 " Bundle 'dahu/vim-asciidoc'
 
 " Very broken:
 " Bundle 'dahu/vim-asciidoc'
 

+" Syntax Highlighting for AsiiDoc
+" Poor color choices for dark theme: Plugin 'dagwieers/asciidoc-vim'
+" Plugin 'traycerb/asciidoc-vim'
+
+" Learn me! <cs - change surrounding, ds - delete sur, ys - add surrounding)
+Plugin 'tpope/vim-surround'
+
+" Quick complete of stuff...
+" Plugin 'SirVer/ultisnips'
+
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" Snippets for ultisnips
+Plugin 'edthedev/vim-snippets'
+
+" Default to use strapdown and markdown for blog posts.
+" UltiSnipsAddFiletypes markdown.strapdown
+
+

 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 


@@ -212,7 +238,8 @@ filetype plugin indent on     " required for Vundle Bundle
 
 
 " If not something else, then asciidoc
 
 
 " If not something else, then asciidoc

-" set filetype=asciidoc
+set filetype=asciidoc
+set syntax=asciidoc

 
 " Don't show tabs for HTML files. Do show trailing spaces."
 au FileType html set nolist
 
 " Don't show tabs for HTML files. Do show trailing spaces."
 au FileType html set nolist


@@ -230,8 +257,6 @@ au FileType markdown set tabstop=2
 au FileType markdown set shiftwidth=2
 " au FileType yaml set expandtab
 "
 au FileType markdown set shiftwidth=2
 " au FileType yaml set expandtab
 "

-
-

 set softtabstop=4 " makes the spaces feel like real tabs
 " Sensible default for everything else.
 set tabstop=2
 set softtabstop=4 " makes the spaces feel like real tabs
 " Sensible default for everything else.
 set tabstop=2