commit a58af731b47961212d30192ef9122a7fb1b1a414
parent 2693983a3974d9a64328ac4d56737d392f56640b
Author: edvb54 <edvb54@gmail.com>
Date: Sat, 7 Jun 2014 13:30:07 -0700
Add and remove plug-ins
Add: goyo.vim, neosnippet, neosnippet-snippets, tmux-complete.vim,
vim-filebeagle, vim-fugitive, vim-gitgutter, vim-pencil.
Remove: ultisnips, unite.vim, vim-indent-guides, isort, vimfiler.vim
Diffstat:
17 files changed, 73 insertions(+), 81 deletions(-)
diff --git a/vim/.netrwhist b/vim/.netrwhist
@@ -1,7 +1,8 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =5
+let g:netrw_dirhist_cnt =6
let g:netrw_dirhist_1='/home/ed/dotfiles/vim/bundle'
let g:netrw_dirhist_2='/home/ed/dotfiles/vim'
let g:netrw_dirhist_3='/home/ed/dotfiles'
let g:netrw_dirhist_4='/home/ed'
let g:netrw_dirhist_5='/home/ed/vim'
+let g:netrw_dirhist_6='/home/ed'
diff --git a/vim/bundle/goyo.vim b/vim/bundle/goyo.vim
@@ -0,0 +1 @@
+Subproject commit ad87a5b35a91bc24d6f9e700ae9cd332f7c3d150
diff --git a/vim/bundle/neosnippet b/vim/bundle/neosnippet
@@ -0,0 +1 @@
+Subproject commit 578530edf1a85a623b7915cd2904407081cadf36
diff --git a/vim/bundle/neosnippet-snippets b/vim/bundle/neosnippet-snippets
@@ -0,0 +1 @@
+Subproject commit 5571cf0c8f05204fafceb5aeafe2716ce91737cc
diff --git a/vim/bundle/tmux-complete.vim b/vim/bundle/tmux-complete.vim
@@ -0,0 +1 @@
+Subproject commit af9a1008a710091e1011c8e113990a0837ad3312
diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips
@@ -1 +0,0 @@
-Subproject commit f2d9e8b608ebead41ca2f43c8c3ad4c6d2fd0a4d
diff --git a/vim/bundle/unite.vim b/vim/bundle/unite.vim
@@ -1 +0,0 @@
-Subproject commit 5b4ed91d09f72ffa2129a81cbb51fc488fa8804b
diff --git a/vim/bundle/vim-filebeagle b/vim/bundle/vim-filebeagle
@@ -0,0 +1 @@
+Subproject commit 6dd2aa0c44e5841e788c4a4065c0ebe0a2725083
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 416165f0630f683b859fd56161183ca3d6eecc44
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit c9595f22e82e0c65b3267f39ff815a68f69e636a
diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides
@@ -1 +0,0 @@
-Subproject commit eec1b629dc4cfa3986d20f21d4b4489732cd3f5a
diff --git a/vim/bundle/vim-isort b/vim/bundle/vim-isort
@@ -1 +0,0 @@
-Subproject commit 72e5220b31836f4e731251059d0d52348cc576eb
diff --git a/vim/bundle/vim-pencil b/vim/bundle/vim-pencil
@@ -0,0 +1 @@
+Subproject commit 84b66f57b557d523451330f0d122ff055dffd074
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
@@ -1 +1 @@
-Subproject commit 5470b2f348071247ebcb0700725c9140dc64684f
+Subproject commit 45bcd32d596ef9db84919d7a1fcb20e4c920cf92
diff --git a/vim/bundle/vimfiler.vim b/vim/bundle/vimfiler.vim
@@ -1 +0,0 @@
-Subproject commit bcf322adaccce844bcc03ee1e98abc7fdc9e8de9
diff --git a/vimrc b/vimrc
@@ -15,10 +15,10 @@ set t_Co=256
set background=dark
" colorscheme badwolf
" colorscheme hybrid
-colorscheme jellybeans
+" colorscheme jellybeans
" colorscheme molokai
" colorscheme skittles_berry
-" colorscheme solarized
+colorscheme solarized
" options{{{2
" airline stuff
@@ -26,31 +26,6 @@ set laststatus=2
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1
-" turn off default GoldenView mappings
-let g:goldenview__enable_default_mapping = 0
-
-" Supertab plug-in option
-let g:SuperTabDefaultCompletionType = "context"
-
-" just some UltiSnips options
-" let g:UltiSnipsExpandTrigger = "<tab>"
-let g:UltiSnipsJumpForwardTrigger = "<S-Right>"
-let g:UltiSnipsJumpBackwardTrigger = "<S-Left>"
-
-" more UltiSnips optoins
-let g:indent_guides_auto_colors = 0
-autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd ctermbg=Black
-autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=DarkGrey
-
-" Indent Guides options
-let g:indent_guides_enable_on_vim_startup = 1
-let g:indent_guides_auto_colors = 0
-let g:indent_guides_default_mapping = 0
-" let g:indent_guides_start_level = 2
-" let g:indent_guides_guide_size = 2
-autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd ctermbg=234
-autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=235
-
" Neocomplete options
let g:acp_enableAtStartup = 0
let g:neocomplete#enable_at_startup = 1
@@ -62,11 +37,26 @@ autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-let NERDTreeIgnore=[ '\.pyc$', '\.pyo$', '\~$']
-let NERDTreeShowBookmarks=1
-let NERDTreeQuitOnOpen=1
+" allow for neocomplete and eclim/tmuxcomplete to work
+let g:EclimCompletionMethod = 'omnifunc'
+let g:tmuxcomplete#trigger = 'omnifunc'
+
+" Neosnippet options
+if has('conceal')
+ set conceallevel=2 concealcursor=i
+endif
+let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets'
+
+" vim-pencil plug-in options
+let g:pencil#wrapModeDefault = 'hard' " or 'soft'
+augroup pencil
+ autocmd!
+ autocmd FileType markdown call pencil#init()
+ autocmd FileType textile call pencil#init()
+ autocmd FileType text call pencil#init({'wrap': 'hard'})
+augroup END
-let g:vimfiler_as_default_explorer = 1
+let g:yankring_history_file = '.yankring_history'
" mappings{{{2
" allow for F3 ro turn on Tagbar plug-in
@@ -75,7 +65,7 @@ nmap <silent> <F3> :TagbarToggle<CR>
" run eclim
nmap <silent> <F5> :Java<CR>
-" set ctrl-m to launch Crunch plug-in
+" set gm to launch Crunch plug-in
" allows you to do math inside of vim
map gm :Crunch<CR>
@@ -84,15 +74,8 @@ nmap [of :syntax on<CR>
nmap ]of :syntax off<CR>
syntax on
-" Impaired plug-in styled IndentGuides options
-nmap cog <Plug>IndentGuidesToggle
-nmap [og <Plug>IndentGuidesEnable
-nmap ]og <Plug>IndentGuidesDisable
-
-" Unite plug-in mapping
-nmap <silent> <C-p> :Unite -start-insert file<CR>
-
" GoldenView stuff
+let g:goldenview__enable_default_mapping = 0
nmap <silent> <C-o> <Plug>GoldenViewSplit
nmap <silent> <F8> <Plug>GoldenViewSwitchMain
nmap <silent> <S-F8> <Plug>GoldenViewSwitchToggle
@@ -111,11 +94,19 @@ inoremap <expr><Right> neocomplete#close_popup() . "\<Right>"
inoremap <expr><Up> neocomplete#close_popup() . "\<Up>"
inoremap <expr><Down> neocomplete#close_popup() . "\<Down>"
-let g:yankring_replace_n_pkey = '<c-l>'
-let g:yankring_replace_n_nkey = '<c-h>'
+" Neosnippet mappings
+imap <C-l> <Plug>(neosnippet_expand_or_jump)
+smap <C-l> <Plug>(neosnippet_expand_or_jump)
+xmap <C-l> <Plug>(neosnippet_expand_target)
+imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+\ "\<Plug>(neosnippet_expand_or_jump)"
+\: pumvisible() ? "\<C-n>" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+\ "\<Plug>(neosnippet_expand_or_jump)"
+\: "\<TAB>"
" turn on VimFiler plug-in
-map <silent> <C-i> :VimFiler<CR>
+map <silent> <C-i> :FileBeagle<CR>
"}}}
" rainbow parentheses stuff{{{2
@@ -207,24 +198,18 @@ set gdefault
" highlight the 81st column so you know when your line is to long
call matchadd('Error', '\%81v', 100)
-" make spell check underline instead of highlight
-hi clear SpellBad
-hi SpellBad ctermfg=red cterm=underline
-
-" turn on highlighting of line
-set cursorline
-set cursorcolumn
-
au BufRead,BufNewFile *.pde set filetype=arduino
au BufRead,BufNewFile *.ino set filetype=arduino
+au BufRead,BufNewFile *.md set filetype=markdown
+
+hi SpellBad ctermfg=red cterm=underline
-" turn off the background for the end of line signs and make faster
-hi clear NonText
+hi CursorLine ctermbg=23
+hi CursorColumn ctermbg=23
-" hi SignColumn ctermbg=16
+hi Normal ctermbg=0
-" better folding color
-" hi Folded ctermfg=241 ctermbg=233
+hi SignColumn ctermbg=0
" mapping{{{1
" make ZS save without closing
@@ -317,8 +302,7 @@ endif
" folding{{{2
set foldmethod=marker
-setlocal foldexpr=(getline(v:lnum)=~'^$')?-1:((indent(v:lnum)<indent(v:lnum+1))?('>'.indent(v:lnum+1)):indent(v:lnum))
-set foldcolumn=3
+set foldcolumn=2
function! NeatFoldText()
let line = ' ' . substitute(getline(v:foldstart), '^\s*"\?\s*\|\s*"\?\s*{{' . '{\d*\s*', '', 'g') . ' '
diff --git a/vimrc.bundles b/vimrc.bundles
@@ -8,7 +8,7 @@ call vundle#rc()
" load Vundle
Plugin 'gmarik/Vundle.vim'
-""" bow down to the Tim Pope plug-ins!!
+""" bow down to the tpope plug-ins!!
" lots of commands to change words
Bundle 'tpope/vim-abolish'
" use <c-g>c to toggle CAPS LOCK
@@ -27,12 +27,12 @@ Bundle 'tpope/vim-surround'
Bundle 'tpope/vim-unimpaired'
" better HTML/XML editing
Bundle 'tpope/vim-ragtag'
+" git plug-in
+Bundle 'tpope/vim-fugitive'
""" language specific plug-ins
" syntax checker
Bundle 'Syntastic'
-" sort python imports using pep8
-Bundle 'fisadev/vim-isort'
" highlight matching HTML/XML tags
Bundle 'MatchTag'
" jump to HTML/XML tags with %
@@ -41,30 +41,38 @@ Bundle 'matchit.zip'
""" window plug-ins
" allows you to have split widows that adjust
Bundle 'zhaocai/GoldenView.Vim'
-" all purpose search plug-in
-Bundle 'Shougo/unite.vim'
" better file explorer
-Bundle 'Shougo/vimfiler.vim'
+Bundle 'jeetsukumaran/vim-filebeagle'
" jump to tags in file, such as classes and functions
Bundle 'Tagbar'
" better status line and tab bar
Bundle 'bling/vim-airline'
-""" auto complete stuff
+""" auto complete plug-ins
" implement snippets
-Bundle 'SirVer/ultisnips'
-" snippets for ultisnips
+Bundle 'Shougo/neosnippet'
+" snippets for Neocomplete
+Bundle 'Shougo/neosnippet-snippets'
+" better snippets for Neocomplete
Bundle 'honza/vim-snippets'
" auto complete words already in file and syntax's
Bundle 'Shougo/neocomplete.vim'
+" addition to neocomplete, allows auto complete of text in other tmux panes
+Bundle 'wellle/tmux-complete.vim'
-""" visual stuff
+""" visual plug-ins
" show where marks are
Bundle 'kshenoy/vim-signature'
" rainbow parentheses
Bundle 'rainbow_parentheses.vim'
-" better looking in indents
-Bundle 'nathanaelkane/vim-indent-guides'
+" see where lines are added, removed, or changed in a git repo
+Bundle 'airblade/vim-gitgutter'
+
+""" writing plug-ins
+Bundle 'reedes/vim-wordy'
+Bundle 'reedes/vim-litecorrect'
+Bundle 'reedes/vim-pencil'
+Bundle 'junegunn/goyo.vim'
""" others
" complete math problems inside of Vim
@@ -79,7 +87,6 @@ Bundle 'gcmt/wildfire.vim'
Bundle 'terryma/vim-multiple-cursors'
" use \\<motion> to jump using that motion
Bundle 'Lokaltog/vim-easymotion'
-" Bundle 'dkprice/Vim-easygrep'
" use s and S to move through line
Bundle 'jayflo/vim-skip'
" better pasting
@@ -87,8 +94,5 @@ Bundle 'YankRing.vim'
" find and replace words in all buffers
Bundle 'jeetsukumaran/vim-buffersaurus'
-Bundle 'reedes/vim-wordy'
-Bundle 'reedes/vim-litecorrect'
-
filetype plugin indent on
