X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/0b1b393bc7fec24e1d06e87aff97f247de84d5bf..e289bc0dc89730581e066de6d2aa212472769311:/vimrc?ds=inline diff --git a/vimrc b/vimrc index d84d225..09fa0d2 100644 --- a/vimrc +++ b/vimrc @@ -1,21 +1,9 @@ " ------------------------------------------------------- " -" EdTheDev's Minimal .vimrc +" EdTheDev's .vimrc " -" Everything belongs in a Vundle plugin. " ------------------------------------------------------- -" When setting up on a new machine, remember to: -" cd ~ -" git clone https://github.com/gmarik/Vundle.vim.git -" ~/.vim/bundle/Vundle.vim -" 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 - " Let the leader key be , let mapleader="," @@ -25,7 +13,6 @@ nnoremap ; : " iPad and Android keyboards have no ESC Key inoremap ii - set smarttab set nocompatible " be iMproved, required @@ -34,163 +21,47 @@ set omnifunc=syntaxcomplete#Complete filetype off " required -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() +" ================= +" Install vim-plug if missing +" ================= +let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim' +if empty(glob(data_dir . '/autoload/plug.vim')) + silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif " ================= " Here be Plugins! " ================= - -" let Vundle manage Vundle -" required! -Plugin 'gmarik/vundle' - -" Helper scripts for editing ReStructuredText -Plugin 'edthedev/text-helper.vim' - -" 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/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' - -" Low contrast color scheme for Gvim - much easier on the eyes. -" Plugin 'junegunn/seoul256.vim' - -" Display tag (function/method) outline -" 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? - -" Browsing files made easier. -" Plugin 'scrooloose/nerdtree' -" nmap r :NERDTreeToggle - -" Async dispatch by Tim Pope -" Plugin 'tpope/vim-dispatch' +call plug#begin('~/.vim/plugged') " Markdown highlighting -Plugin 'tpope/vim-markdown' -let g:markdown_github_languages = ['sh', 'python'] - -"Plugin 'jceb/vim-orgmode' -"let g:org_todo_keywords=['TODO', 'DONE', 'WAITING', 'CANCELED'] -"let g:org_agenda_files=['~/index.org'] - -" More obvious default behaviors -" Plugin 'edthedev/wordlike.vim' - -" Plugin 'xolox/vim-notes' -" Add @Tag search support -"Bundle 'fmoralesc/vim-pad' -" let g:pad_dir='~/Copy/notes' +" Plug 'tpope/vim-markdown' +" Plug 'plasticboy/vim-markdown' +" let g:markdown_github_languages = ['sh', 'python'] " Distraction free writing. -Plugin 'junegunn/goyo.vim' -nnoremap w :Goyo - -" 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' -" 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 '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' -" Read up on it here: https://github.com/farseer90718/vim-taskwarrior -" - -" For REST APIs Press QQ in normal mode to open. -" Plugin 'nicwest/QQ.vim' - -" 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 +Plug 'junegunn/goyo.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' +Plug 'bling/vim-airline' -" HTML -" Bundle 'othree/html5.vim' -"Bundle 'evidens/vim-twig' -"Bundle 'tokutake/twig-indent' -"Bundle 'groenewege/vim-less' -"Bundle 'hail2u/vim-css3-syntax' +" Plugin 'Windows-PowerShell-Syntax-Plugin' -" Quick complete of stuff... -" Plugin 'SirVer/ultisnips' +" PowerShell Highlighting and detection +Plug 'pprovost/vim-ps1' -" let g:UltiSnipsExpandTrigger="" -" let g:UltiSnipsJumpForwardTrigger="" -" let g:UltiSnipsJumpBackwardTrigger="" - -" Snippets for ultisnips -" Plugin 'edthedev/vim-snippets' - -" Default to use strapdown and markdown for blog posts. -" UltiSnipsAddFiletypes markdown.strapdown +" Much better theme +" Plug NLKNguyen/papercolor-theme +" +" +" Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } +call plug#end() -call vundle#end() filetype plugin indent on " required for Vundle Bundle -" Page down with space key -" nn -" Shift space is undetectable in many terminals... -" nn - +nnoremap w :Goyo " If not something else, then assume Markdown set filetype=markdown @@ -206,5 +77,16 @@ set softtabstop=4 " makes the spaces feel like real tabs set tabstop=2 set shiftwidth=2 +" Working with Go +au BufNewFile,BufRead *.go set noet ts=2 sw=2 sts=2 + +" Working with Markdown + +au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown +colorscheme elflord +set number -colorscheme slate +set backupdir=c:\temp,.backup/,~/.backup/,/tmp// +set directory=c:\temp,.swp/,~/.swp/,/tmp// +set undodir=c:\temp,.undo/,~/.undo/,/tmp// +set backspace=indent,eol,start " Do not be pedantic about backspace.