diff --git a/vimrc b/vimrc index fca187d..272bd10 100644 --- a/vimrc +++ b/vimrc @@ -14,28 +14,28 @@ Plug 'chrisbra/Recover.vim' Plug 'Shougo/vimproc.vim' , { 'do': 'make -f make_unix.mak' } -Plug 'Shougo/unite.vim' -Plug 'tsukkee/unite-tag' -Plug 'Shougo/neomru.vim' +Plug 'kien/ctrlp.vim' Plug 'ciaranm/securemodelines' Plug 'chrisbra/SudoEdit.vim' -Plug 'nanotech/jellybeans.vim' Plug 'majutsushi/tagbar' Plug 'bling/vim-airline' Plug 'scrooloose/syntastic' Plug 'tomtom/tcomment_vim' -"Plug 'Raimondi/delimitMate' " Plug 'jalcine/cmake.vim' --slow Plug 'editorconfig/editorconfig-vim' +" vim-sleuth? Plug 'kchmck/vim-coffee-script' Plug 'pangloss/vim-javascript' Plug 'mtscout6/vim-cjsx' Plug 'mxw/vim-jsx' +Plug 'othree/html5.vim' +Plug 'digitaltoad/vim-jade' +Plug 'marijnh/tern_for_vim' Plug 'ledger/vim-ledger' @@ -49,20 +49,17 @@ Plug 'tpope/vim-projectionist' Plug 'tpope/vim-dispatch' Plug 'tpope/vim-fireplace' -Plug 'marijnh/tern_for_vim' - Plug 'jnwhiteh/vim-golang' Plug 'Blackrush/vim-gocode' Plug 'zah/nimrod.vim' Plug 'wting/rust.vim' +Plug 'racer-rust/vim-racer', { 'for': 'rust' } Plug 'derekwyatt/vim-scala' " Plug 'ensime/ensime-vim' -Plug 'othree/html5.vim' - Plug 'dogrover/vim-pentadactyl' Plug 'superbrothers/vim-vimperator' @@ -80,14 +77,10 @@ Plug 'rhysd/vim-grammarous' Plug 'tpope/vim-surround' -Plug 'Lokaltog/vim-easymotion' - Plug 'peterhoeg/vim-qml' Plug 'ekalinin/Dockerfile.vim' -Plug 'digitaltoad/vim-jade' - Plug 'jvoorhis/coq.vim' Plug 'MarcWeber/vim-addon-mw-utils' @@ -98,8 +91,6 @@ Plug 'MarcWeber/vim-addon-goto-thing-at-cursor' Plug 'MarcWeber/vim-addon-errorformats' Plug 'MarcWeber/vim-addon-nix' -" vim-sleuth? - Plug 'urbit/hoon.vim' Plug 'ahf/twelf-syntax' @@ -164,43 +155,8 @@ function LedgerGeneratePostings() '<,'>s/\s\s\s+/ /g endfunction -let g:jellybeans_background_color = '000000' - if &term == "screen" || &term == "screen-bce" set t_ts=k set t_fs=\ endif set title - -" unite bindings -if executable('ag') - let g:unite_source_grep_command = 'ag' - let g:unite_source_grep_default_opts = '--noheading --nocolor' - let g:unite_source_rec_async_command= 'ag --nocolor --nogroup -g ""' -endif -call unite#filters#matcher_default#use(['matcher_fuzzy']) -call unite#filters#sorter_default#use(['sorter_selecta']) -call unite#custom#profile('default', 'context', { - \ 'ignorecase': 1, - \ 'smartcase': 1, - \ }) -" The prefix key -nnoremap [unite] -nmap [unite] -" General purpose -nnoremap [unite] :Unite -start-insert source -" Files -nnoremap [unite]f :Unite -start-insert file_rec/async -" Grepping -nnoremap [unite]g :Unite grep:. -nnoremap [unite]d :Unite grep:.:-s:\(TODO\|FIXME\) -" Content -nnoremap [unite]o :Unite -start-insert -auto-preview outline -nnoremap [unite]l :Unite -start-insert line -nnoremap [unite]t :Unite -auto-preview -start-insert tag -" Quickly switch between recent things -nnoremap [unite]F :Unite buffer tab file_mru directory_mru -nnoremap [unite]b :Unite buffer -nnoremap [unite]m :Unite file_mru -" Yank history -nnoremap [unite]y :Unite history/yank