about summary refs log tree commit diff
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rwxr-xr-xvim/.vim/vimrc9
1 files changed, 4 insertions, 5 deletions
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index e72b9e4..08a07a2 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -17,14 +17,15 @@ set diffopt+=algorithm:patience
 
 augroup vimrc
   autocmd!
+  autocmd BufNewFile,BufRead *.vert,*.geom,*.frag setlocal filetype=glsl
+  autocmd BufNewFile,BufRead *.info setlocal filetype=json
   autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
   autocmd BufNewFile,BufRead *.m setlocal filetype=octave
   autocmd FileType asm,c,h,go,glsl,sshconfig,php
         \ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 tabstop=8
-  autocmd FileType vim,sh,lua,tex,cmake,cpp,plantuml,html,octave,pascal
+  autocmd FileType vim,sh,scheme,lua,tex,cmake,cpp,plantuml,html,octave,pascal
         \ setlocal shiftwidth=2
   autocmd FileType rst setlocal shiftwidth=3
-  autocmd FileType java setlocal omnifunc=javacomplete#Complete
   autocmd BufWinEnter *
         \ if &filetype ==# 'python' || &filetype ==# 'cython'
         \ | let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) |
@@ -35,7 +36,6 @@ augroup END
 
 let g:netrw_banner = 0
 let g:netrw_liststyle = 3
-let g:VM_Enabled = 1
 let g:srcery_italic = 1
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0
@@ -45,7 +45,6 @@ let g:polyglot_disabled = ['latex']
 
 packadd! python-jedi
 call plug#begin('~/.vim/plugged')
-Plug 'https://github.com/andrep/vimacs'
 Plug 'https://github.com/vim/killersheep'
 Plug 'https://github.com/sheerun/vim-polyglot'
 Plug 'https://github.com/francoiscabrol/ranger.vim'
@@ -56,7 +55,6 @@ Plug 'https://github.com/kovisoft/slimv', {'for': 'lisp'}
 Plug 'https://github.com/anntzer/vim-cython', {'for': 'cython'}
 Plug 'https://github.com/racer-rust/vim-racer', {'for': 'rust'}
 Plug 'https://github.com/rhysd/rust-doc.vim', {'for': 'rust'}
-Plug 'https://github.com/artur-shaik/vim-javacomplete2', {'for': 'java'}
 call plug#end()
 
 set t_Co=256
@@ -65,3 +63,4 @@ map Q gq
 command Q q
 command W w
 nmap W :w<CR>
+imap <C-x><C-x> <C-^>