X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/blobdiff_plain/759ef4c4f99ffb59bb11b6de3baa1bd5b91b8570..8417877b554ba46288cb75fe6d013ed969d0afe2:/vimrc?ds=inline diff --git a/vimrc b/vimrc index 9661d67..533872d 100644 --- a/vimrc +++ b/vimrc @@ -12,9 +12,9 @@ " vim +BundleInstall +qall " " Automatically setup Vundle on first run -if !isdirectory(expand("~/.vim/bundle/Vundle.vim")) - call system("git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle") - endif +" if !isdirectory(expand("~/.vim/bundle/Vundle.vim")) +" call system("git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle") +" endif " Let the leader key be , let mapleader="," @@ -45,73 +45,52 @@ call vundle#begin() " required! Plugin 'gmarik/vundle' -" Helper scripts for editing ReStructuredText -Plugin 'edthedev/text-helper.vim' - " EdTheDev's Minion file organizer. -Plugin 'edthedev/minion' +" Plugin 'edthedev/minion' " let g:minion_map_keys = 0 " Syntax helpers for ReStructuredText -Plugin 'edthedev/rst-syntax.vim' +" Plugin 'edthedev/rst-syntax.vim' " EdTheDev's Vim configuration for Python PEP8 -Plugin 'edthedev/vim-pep8' -let g:minion_todo_map_keys = 1 +" Plugin 'edthedev/vim-pep8' +" let g:minion_todo_map_keys = 1 " let g:vimroom_ctermbackground = "black" -" - -" Trac plugin for Vim -" Plugin 'mjbrownie/Trac.vim' -" :help trac -" let g:tracServerList = {} -" let g:tracServerList['sdg'] = -"" \'http://username:password@trac.nukulele.org/login/xmlrpc' "Plugin 'fmoralesc/vim-pad' " let g:pad_dir='~/Copy/notes' -" Pelican.vim Revived! -Plugin 'edthedev/pelican.vim' -let g:pelican_blog_source = '~/Copy/blog' -let g:pelican_blog_html = '~/blog_html' -let g:pelican_git_master = 'git@bitbucket.org:edthedev/blog.git' -let g:pelican_publish_server = 'uiucedward@hathor.dreamhost.com:~/edward.delaporte.us' - " Low contrast color scheme for Gvim - much easier on the eyes. -Plugin 'junegunn/seoul256.vim' +" Plugin 'junegunn/seoul256.vim' " Display tag (function/method) outline -Plugin 'majutsushi/tagbar' -nmap t :TagbarToggle +" Plugin 'majutsushi/tagbar' +" nmap t :TagbarToggle " EdTheDev's Vim configuration for TODO list items. -Plugin 'edthedev/vim-todo' -let g:vim_todo_keys = 1 - -" Automatic closing of parenthesis -" Plugin 'Raimondi/delimitMate' -" - Caused syntax color problems for RST? +" Plugin 'edthedev/vim-todo' +" let g:vim_todo_keys = 1 " Browsing files made easier. -Plugin 'scrooloose/nerdtree' -nmap r :NERDTreeToggle +" Plugin 'scrooloose/nerdtree' +" nmap r :NERDTreeToggle " Async dispatch by Tim Pope -Plugin 'tpope/vim-dispatch' +" 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? -" "Plugin 'jceb/vim-orgmode' "let g:org_todo_keywords=['TODO', 'DONE', 'WAITING', 'CANCELED'] -"let g:org_agenda_files=['~/Google Drive/index.org'] +"let g:org_agenda_files=['~/index.org'] " More obvious default behaviors -Plugin 'edthedev/wordlike.vim' +" Plugin 'edthedev/wordlike.vim' " Plugin 'xolox/vim-notes' " Add @Tag search support @@ -121,34 +100,26 @@ Plugin 'edthedev/wordlike.vim' " Distraction free writing. Plugin 'junegunn/goyo.vim' nnoremap w :Goyo -" Limelight doesn't work with iterm -" Plugin 'junegunn/limelight.vim' -" nnoremap w :Goyo:Limelight - -Plugin 'vim-scripts/pylint-mode' -let g:PyLintCWindow = 1 -let g:PyLintSigns = 1 -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,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913' + +" Plugin 'vim-scripts/pylint-mode' +" let g:PyLintCWindow = 1 +" let g:PyLintSigns = 1 +" let g:PyLintOnWrite = 1 +" 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' -" Plugin 'edthedev/vim-arduino-ino' -let g:arduino_compile_command = 'ino build --board-model=atmega328' -" let g:arduino_compile_command = 'Dispatch ino build --board-model=atmega328' -let g:arduino_upload_command = 'ino upload --board-model=atmega328' +" Plugin 'edthedev/arduino.vim' +" let g:arduino_compile_command = 'ino build --board-model=atmega328' +" let g:arduino_upload_command = 'ino upload --board-model=atmega328' " Plugin 'tomswartz07/vim-todo' " " Run commands from the current line and get their output. -Plugin 'edthedev/cmd.vim' +" Plugin 'edthedev/cmd.vim' -Plugin 'itchyny/thumbnail.vim' +" Plugin 'itchyny/thumbnail.vim' " :Thumbnail -" + " Plugin 'farseer90718/vim-taskwarrior' " let g:task_rc_override = 'defaultwidth=999' " Plugin 'farseer90718/vim-taskwarrior' @@ -158,49 +129,34 @@ Plugin 'itchyny/thumbnail.vim' " " For REST APIs Press QQ in normal mode to open. -Plugin 'nicwest/QQ.vim' - -" Plugin 'scrooloose/syntastic' +" Plugin 'nicwest/QQ.vim' -Plugin 'mihaifm/bufstop' -nn b :Bufstop " get a visual on the buffers -map a :BufstopModeFast " a command for quick switching +" Plugin 'mihaifm/bufstop' +" nn b :Bufstop " get a visual on the buffers +" map a :BufstopModeFast " a command for quick switching " Sensible defaults for Markdown " Plugin 'plasticboy/vim-markdown' " set nofoldenable "Do not fold everything -" Ctrl P on steroids... -" 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/'}] +" Plugin 'Windows-PowerShell-Syntax-Plugin' + +" Quick complete of stuff... +" Plugin 'SirVer/ultisnips' -" Emacs style kill-paste ring -" Plugin 'vim-scripts/YankRing.vim' -" :h yankring.txt -" :h yankring-tutorial +" let g:UltiSnipsExpandTrigger="" +" let g:UltiSnipsJumpForwardTrigger="" +" let g:UltiSnipsJumpBackwardTrigger="" -" Javascript -" Plugin 'maksimr/vim-jsbeautify' -"Plugin 'einars/js-beautify' -" -" Plugin 'Delapouite/vim-javascript-syntax' -"Plugin 'pangloss/vim-javascript' +" Snippets for ultisnips +" Plugin 'edthedev/vim-snippets' -" HTML -" Bundle 'othree/html5.vim' -"Bundle 'evidens/vim-twig' -"Bundle 'tokutake/twig-indent' -"Bundle 'groenewege/vim-less' -"Bundle 'hail2u/vim-css3-syntax' +" Default to use strapdown and markdown for blog posts. +" UltiSnipsAddFiletypes markdown.strapdown -" AsciiDoc -" Very broken: -" Bundle 'dahu/vim-asciidoc' call vundle#end() filetype plugin indent on " required for Vundle Bundle @@ -211,29 +167,18 @@ filetype plugin indent on " required for Vundle Bundle " nn -" If not something else, then asciidoc -" set filetype=asciidoc +" If not something else, then assume Markdown +set filetype=markdown +set syntax=markdown " 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 -au FileType yaml set tabstop=2 -au FileType yaml set shiftwidth=2 -au FileType yaml set expandtab - -" Two spaces for Markdown files. -au BufRead,BufNewFile *.md set filetype=markdown -au FileType markdown set tabstop=2 -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 +colorscheme slate