Adding Utilisnips

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 3e91fed92faf0655dfb58c554e20548703b5a041..8709aae23adfef7d7e5df1a118e4e9e137212cad 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -46,12 +46,14 @@ call vundle#begin()
 Plugin 'gmarik/vundle'
 
 " Helper scripts for editing ReStructuredText
 Plugin 'gmarik/vundle'
 
 " Helper scripts for editing ReStructuredText

-" Plugin 'edthedev/text-helper.vim'
+Plugin 'edthedev/text-helper.vim'

 
 " EdTheDev's Minion file organizer.
 Plugin 'edthedev/minion'
 " let g:minion_map_keys = 0
 
 
 " EdTheDev's Minion file organizer.
 Plugin 'edthedev/minion'
 " let g:minion_map_keys = 0
 

+
+" Syntax helpers for ReStructuredText

 Plugin 'edthedev/rst-syntax.vim'
 
 " EdTheDev's Vim configuration for Python PEP8
 Plugin 'edthedev/rst-syntax.vim'
 
 " EdTheDev's Vim configuration for Python PEP8


@@ -101,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?
 "


@@ -108,6 +115,7 @@ Plugin 'tpope/vim-dispatch'
 "let g:org_todo_keywords=['TODO', 'DONE', 'WAITING', 'CANCELED']
 "let g:org_agenda_files=['~/Google Drive/index.org']
 
 "let g:org_todo_keywords=['TODO', 'DONE', 'WAITING', 'CANCELED']
 "let g:org_agenda_files=['~/Google Drive/index.org']
 

+" More obvious default behaviors

 Plugin 'edthedev/wordlike.vim'
 
 " Plugin 'xolox/vim-notes'
 Plugin 'edthedev/wordlike.vim'
 
 " Plugin 'xolox/vim-notes'


@@ -131,6 +139,7 @@ let g:PyLintOnWrite = 1
 " 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,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'
 

+" Help building Arduino source files.

 Plugin 'edthedev/arduino.vim'
 " Plugin 'edthedev/vim-arduino-ino'
 let g:arduino_compile_command = 'ino build --board-model=atmega328'
 Plugin 'edthedev/arduino.vim'
 " Plugin 'edthedev/vim-arduino-ino'
 let g:arduino_compile_command = 'ino build --board-model=atmega328'


@@ -139,6 +148,7 @@ let g:arduino_upload_command = 'ino upload --board-model=atmega328'
 
 " Plugin 'tomswartz07/vim-todo'
 "
 
 " Plugin 'tomswartz07/vim-todo'
 "

+" Run commands from the current line and get their output.

 Plugin 'edthedev/cmd.vim'
 
 Plugin 'itchyny/thumbnail.vim'
 Plugin 'edthedev/cmd.vim'
 
 Plugin 'itchyny/thumbnail.vim'


@@ -155,35 +165,74 @@ Plugin 'itchyny/thumbnail.vim'
 " For REST APIs Press QQ in normal mode to open.
 Plugin 'nicwest/QQ.vim'
 
 " For REST APIs Press QQ in normal mode to open.
 Plugin 'nicwest/QQ.vim'
 

-Plugin 'scrooloose/syntastic'
+" Plugin 'scrooloose/syntastic'

 
 Plugin 'mihaifm/bufstop'
 nn <leader>b :Bufstop<CR>             " get a visual on the buffers
 map <leader>a :BufstopModeFast<CR>     " a command for quick switching
 
 " Sensible defaults for Markdown
 
 Plugin 'mihaifm/bufstop'
 nn <leader>b :Bufstop<CR>             " get a visual on the buffers
 map <leader>a :BufstopModeFast<CR>     " a command for quick switching
 
 " Sensible defaults for Markdown

-Plugin 'plasticboy/vim-markdown'
-set nofoldenable "Do not fold everything
+" Plugin 'plasticboy/vim-markdown'
+" set nofoldenable "Do not fold everything

 
 " Ctrl P on steroids...
 
 " Ctrl P on steroids...

-Plugin 'Shougo/unite.vim'
+" Plugin 'Shougo/unite.vim'

 
 " Better status line.
 Plugin 'bling/vim-airline'
 
 
 " 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/'}]
+" 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'
+"    :h yankring.txt
+"    :h yankring-tutorial
+
+" Javascript
+" Plugin 'maksimr/vim-jsbeautify'
+"Plugin 'einars/js-beautify'
+" 
+" Plugin 'Delapouite/vim-javascript-syntax'
+"Plugin 'pangloss/vim-javascript'
+
+" HTML
+" Bundle 'othree/html5.vim'
+"Bundle 'evidens/vim-twig'
+"Bundle 'tokutake/twig-indent'
+"Bundle 'groenewege/vim-less'
+"Bundle 'hail2u/vim-css3-syntax'
+
+" 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'
+
+" Snippets for ultisnips
+Plugin 'honza/vim-snippets'

 
 

-# Emacs style kill-paste ring
-Plugin 'vim-scripts/YankRing.vim'

 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
 " Page down with space key
 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
 " Page down with space key

-nn <space> <c-d>
+" nn <space> <c-d>

 " Shift space is undetectable in many terminals...
 " Shift space is undetectable in many terminals...

-nn <S-space> <c-u>
+" nn <S-space> <c-u>
+
+
+" If not something else, then 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


@@ -201,9 +250,8 @@ 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 shiftwidth=2
 set softtabstop=4 " makes the spaces feel like real tabs
 " Sensible default for everything else.
 set tabstop=2
 set shiftwidth=2

+