diff --git a/.vimrc b/.vimrc index d66bea2..644eeed 100644 --- a/.vimrc +++ b/.vimrc @@ -10,25 +10,20 @@ call neobundle#begin(expand('~/.vim/bundle/')) NeoBundleFetch "Shougo/neobundle.vim" " my bundles here: - NeoBundle 'Shougo/neocomplcache.git' + NeoBundle 'Shougo/neosnippet.git' +NeoBundle 'Shougo/neosnippet-snippets' +NeoBundle 'honza/vim-snippets' + NeoBundle 'Shougo/unite.vim.git' NeoBundle "thinca/vim-quickrun" NeoBundle 'vim-scripts/sudo.vim' NeoBundle 'tpope/vim-surround.git' NeoBundle 'h1mesuke/vim-alignta' NeoBundle 'kana/vim-smartchr' -NeoBundle 'vim-ruby/vim-ruby' NeoBundle 'AutoClose' NeoBundle 'nathanaelkane/vim-indent-guides' -NeoBundle 'honza/vim-snippets' -NeoBundle 'mattn/emmet-vim' -NeoBundle 'jiangmiao/simple-javascript-indenter' -NeoBundle 'OpsRockin/opscode_chef.vim_dict' -NeoBundle 'Shougo/neosnippet-snippets' - -NeoBundle 'w0rp/ale' NeoBundle 'Shougo/vimproc.git', { \ 'build' : { @@ -39,6 +34,9 @@ NeoBundle 'Shougo/vimproc.git', { NeoBundle 'prabirshrestha/vim-lsp' NeoBundle 'mattn/vim-lsp-settings' +NeoBundle 'thomasfaingnaert/vim-lsp-snippets' +NeoBundle 'thomasfaingnaert/vim-lsp-neosnippet' + NeoBundle 'fatih/vim-go' call neobundle#end() @@ -157,12 +155,6 @@ let g:neosnippet#enable_snipmate_compatibility = 1 " Tell Neosnippet about the other snippets let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets, ~/.vim/snippets' -" Load rspec.snip when loading rspec files -function! s:RSpecSnippet() - NeoSnippetSource ~/.vim/snippets/ruby.serverspec.snip -endfunction - -autocmd BufEnter *_spec.rb call s:RSpecSnippet() " ------------------------------------------------------------------------------- " Quickrun @@ -342,12 +334,6 @@ let g:indent_guides_enable_on_vim_startup = 1 autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=LightBlue ctermbg=3 autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=darkgrey ctermbg=4 -" === simple-javascript-indenter === -" shiftwidthを1にしてインデントしてくれる -let g:SimpleJsIndenter_BriefMode = 1 -" この設定入れるとswitchのインデントがいくらかマシに -let g:SimpleJsIndenter_CaseIndentLevel = -1 - " === highlight the string under the cursol === highlight CurrentWord cterm=underline ctermbg=NONE ctermfg=DarkMagenta @@ -382,10 +368,3 @@ augroup cwh autocmd! autocmd CursorMoved,CursorMovedI * call s:HighlightCurrentWord() augroup END - -let g:ale_sign_error = '!!' -let g:ale_sign_warning = '==' -let g:ale_sign_column_always = 1 -let g:ale_echo_msg_error_str = 'E' -let g:ale_echo_msg_warning_str = 'W' -let g:ale_echo_msg_format = '[%linter%] %s [%severity%]'