diff --git a/vim/vimrc b/vim/vimrc index 0e50eb3..ef6d6d4 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,16 +3,13 @@ if has('conceal') set conceallevel=2 concealcursor=i endif nnoremap autoformat! :%s/, /,:%s/ \/ /\/:%s/ {/{:%s/} /}:%s/ = /= +let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s3 -xG -S -K -N -xn -xl -n -p -H"' +let g:formatters_java = ['my_custom_java'] command! WW %!sudo tee > /dev/null % "TODO: Fix this "let g:rbpt_loadcmd_toggle = 1 -"autocmd BufRead,BufNewFile * RainbowParenthesesActivate -""autocmd BufRead,BufNewFile * RainbowParenthesesToggle -""autocmd BufRead,BufNewFile * RainbowParenthesesLoadBraces -"autocmd BufRead,BufNewFile * RainbowParenthesesLoadRound -"autocmd BufRead,BufNewFile * RainbowParenthesesLoadSquare -"autocmd BufRead,BufNewFile * RainbowParenthesesLoadChevrons let g:indent_guides_auto_colors = 0 +autocmd FileType java set shiftwidth=3 tabstop=3 softtabstop=3 expandtab autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=darkgrey ctermbg=darkgrey autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey filetype plugin on @@ -314,6 +311,7 @@ Plug 'https://github.com/fatih/vim-go' "go syntax | https://github.com/fatih/vim-go "Plug 'https://github.com/kien/rainbow_parentheses.vim' " "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim +" " Removed because they did not function when changing buffers Plug 'https://github.com/jiangmiao/auto-pairs' "Automatic pairs | https://github.com/jiangmiao/auto-pairs Plug 'https://github.com/Valloric/YouCompleteMe' @@ -330,6 +328,8 @@ Plug 'https://github.com/xolox/vim-misc' "Misc (required for easytags) | https://github.com/xolox/vim-misc Plug 'https://github.com/habamax/vim-skipit' " | https://github.com/habamax/vim-skipit +Plug 'gaw:stonewareslord/vim-java-getset.git' + " | gogs@austenwares.com:stonewareslord/vim-java-getset.git call plug#end() filetype plugin indent on if exists("+undofile")