Clean up

after/ftplugin/bib.vim

@@ -1 +0,0 @@
-map <nowait> <silent> <Leader>f :%!bibformat<CR>

after/ftplugin/c.vim

@@ -1,4 +0,0 @@
-let c_space_errors = 1
-let c_space_errors = 1
-let c_no_comment_fold = 1
-let g:syntastic_c_checkers=['make']

after/ftplugin/java.lua

@@ -0,0 +1,22 @@
+vim.api.nvim_buf_set_option(0, 'textwidth', 120)
+vim.cmd.iabbrev('syso', 'System.out.println')
+
+local bmap = vim.keymap.set
+local map_opt = { silent = true, buffer = true }
+
+bmap('n', '<leader>ev', function() require('jdtls').extract_variable() end,
+	{ silent = true, buffer = true, desc = 'Extract variable'})
+bmap('v', '<leader>ev', function() require('jdtls').extract_variable(true) end,
+	{ silent = true, buffer = true, desc = 'Extract variable'})
+bmap('n', '<leader>ec', function() require('jdtls').extract_constant() end,
+	{ silent = true, buffer = true, desc = 'Extract constant'})
+bmap('v', '<leader>ec', function() require('jdtls').extract_constant(true) end,
+	{ silent = true, buffer = true, desc = 'Extract constant'})
+bmap('v', '<leader>em', function() require('jdtls').extract_method(true) end,
+	{ silent = true, buffer = true, desc = 'Extract method'})
+bmap('n', '<leader>ro', function() require('jdtls').organize_imports() end,
+	{ silent = true, buffer = true, desc = 'Organize imports'})
+bmap('n', '<leader>tc', function() require 'jdtls'.test_class() end,
+	{ silent = true, buffer = true, desc = 'Test class'})
+bmap('n', '<leader>tm', function() require 'jdtls'.test_nearest_method() end,
+	{ silent = true, buffer = true, desc = 'Test nearest method'})

after/ftplugin/java.vim

@@ -1,47 +0,0 @@
-iab <buffer> syso System.out.println
-
-setlocal foldmethod=syntax
-setlocal foldenable
-setlocal textwidth=120
-
-nnoremap <silent> <buffer> <leader>jd :JavaDocComment<cr>
-nnoremap <silent> <buffer> <F2>       :JavaDocPreview<cr>
-nnoremap <silent> <buffer> <F3>       :JavaSearchContext<cr>
-nnoremap <silent> <buffer> <leader>ev <Cmd>lua require('jdtls').extract_variable()<CR>
-vnoremap <silent> <buffer> <leader>ev <Esc><Cmd>lua require('jdtls').extract_variable(true)<CR>
-nnoremap <silent> <buffer> <leader>ec <Cmd>lua require('jdtls').extract_constant()<CR>
-vnoremap <silent> <buffer> <leader>ec <Esc><Cmd>lua require('jdtls').extract_constant(true)<CR>
-vnoremap <silent> <buffer> <leader>em <Esc><Cmd>lua require('jdtls').extract_method(true)<CR>
-nnoremap          <buffer> <leader>ro <Cmd>lua require('jdtls').organize_imports()<CR>
-
-nnoremap <silent> <buffer> <leader>tc <Cmd>lua require'jdtls'.test_class()<CR>
-nnoremap <silent> <buffer> <leader>tm <Cmd>lua require'jdtls'.test_nearest_method()<CR>
-
-inoremap <expr> <C-Space> pumvisible() \|\| &omnifunc == '' ?
-\ "\<lt>C-n>" :
-\ "\<lt>C-x>\<lt>C-o><c-r>=pumvisible() ?" .
-\ "\"\\<lt>c-n>\\<lt>c-p>\\<lt>c-n>\" :" .
-\ "\" \\<lt>bs>\\<lt>C-n>\"\<CR>"
-imap <C-@> <C-Space>map <silent> <buffer>     <C-Space>  <C-x><C-o>
-
-function! InsertJavaPackage()
-  let filename = expand("%")
-  let filename = substitute(filename, "\.java$", "", "")
-  let dir = getcwd() . "/" . filename
-  let dir = substitute(dir, "^.*\/src\/", "", "")
-  let dir = substitute(dir, "\/[^\/]*$", "", "")
-  let dir = substitute(dir, "\/", ".", "g")
-  let filename = substitute(filename, "^.*\/", "", "")
-  let dir = "package " . dir . ";"
-  let result = append(0, dir)
-  let result = append(1, "")
-  let result = append(2, "class " . filename . " {")
-  let result = append(4, "}")
-endfunction
-
-"java {{{
-"if filereadable(bufname("%")) == 0
-"	call InsertJavaPackage()
-"endif
-
-"}}}

after/ftplugin/ruby.vim

@@ -1,10 +1,4 @@
 setl sts=2
 setl sw=2
 setl expandtab
-setl omnifunc=rubycomplete#Complete
-let g:rubycomplete_buffer_loading = 1
-let g:rubycomplete_classes_in_global = 1
-
-nmap K :!ri <cword><cr>
-
 hi link rubySymbol Special

after/ftplugin/tex.vim

@@ -1,11 +1,3 @@
-if exists("&cole")
-  " conceal" Use conceal vim 7.3 feature:
-  set cole=0	" conceal level
-  " Conceal in tex file: "admgs", a=accents, d=delimiters, m=math symbols,
-  " g=Greek, s=superscripts/subscripts:
-  let g:tex_conceal="agm"
-endif
-
 imap <buffer> [[         \begin{<C-x><C-o>
 imap <buffer> ]]         <Plug>(vimtex-delim-close)
 imap <buffer> [(         \left(