X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=347f93a28608019b1bebd25d28d24daae6b9445c;hb=5a37b36846a2588d7c26984c30f2dbd554a9e387;hp=c39436f6209fe414277efa7b203018cb6688a149;hpb=62a4997c0138796041aa257d18ee2dc6d3fd151f;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c39436f..347f93a 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -32,7 +32,8 @@ Plugin 'majutsushi/tagbar'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'Chiel92/vim-autoformat'
-Plugin 'python-mode/python-mode'
+Plugin 'python-rope/ropevim'
+Plugin 'pangloss/vim-javascript'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -141,9 +142,6 @@ let g:python_highlight_string_templates = 1
 let g:python_highlight_class_vars = 1
 let g:python_highlight_operators = 1
 
-" Python indent
-autocmd FileType python setlocal foldmethod=indent foldnestmax=2
-
 " Paren highlighting
 hi MatchParen cterm=underline ctermbg=none ctermfg=none
 
@@ -169,13 +167,5 @@ let g:formatdef_autopep8 = "'autopep8 --aggressive --aggressive - --range '.a:fi
 let g:formatters_python = ['autopep8']
 noremap <F3> :Autoformat<CR>
 
-let g:pymode_lint = 0
-let g:pymode_folding = 1
-let g:pymode_rope = 1
-let g:pymode_rope_completion = 1
-
-augroup unset_folding_in_insert_mode
-    autocmd!
-    autocmd InsertEnter *.py setlocal foldmethod=marker
-    autocmd InsertLeave *.py setlocal foldmethod=expr
-augroup END
+let ropevim_goto_def_newwin = 1
+let ropevim_guess_project = 1