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(

after/plugin/airline.vim

@@ -1,18 +0,0 @@
-let g:airline_powerline_fonts = 1
-let g:airline_left_sep = ''
-let g:airline_left_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_right_alt_sep = ''
-let g:airline_symbols.branch = ''
-let g:airline_symbols.readonly = ''
-let g:airline_symbols.linenr = ''
-let g:airline_section_z = 'L:%l/%L C:%v'
-
-function! LspStatus() abort
-  let status = luaeval('require("lsp-status").status()')
-  return trim(status)
-endfunction
-call airline#parts#define_function('lsp_status', 'LspStatus')
-call airline#parts#define_condition('lsp_status', 'luaeval("#vim.lsp.buf_get_clients() > 0")')
-let g:airline#extensions#nvimlsp#enabled = 0
-let g:airline_section_warning = airline#section#create_right(['lsp_status'])

after/plugin/autoformat.vim

@@ -1,2 +0,0 @@
-let g:formatdef_scalafmt = '"scalafmt --stdin 2>/dev/null"'
-let g:formatters_scala = ['scalafmt']

after/plugin/c.vim

@@ -1,4 +1,3 @@
-
 "{{{ c header gates
 function! s:insert_gates()
 	let gatename = substitute(toupper(expand("%:t")), "\\.", "_", "g")
@@ -8,5 +7,4 @@ function! s:insert_gates()
 	normal! kk
 endfunction
 autocmd BufNewFile *.{h,hpp} call <SID>insert_gates()
-
 "}}}

after/plugin/centerscroll.vim

@@ -1,17 +1,18 @@
-set scrolloff=99999
+" from https://vi.stackexchange.com/a/26055
-set lazyredraw
+augroup KeepCentered
+  autocmd!
+  autocmd CursorMoved * normal! zz
+  autocmd TextChangedI * call InsertRecenter()
+augroup END
 
-nnoremap <C-U> 11kzz
+function InsertRecenter() abort
-nnoremap <C-D> 11jzz
+  let at_end = getcursorcharpos()[2] > len(getline('.'))
-nnoremap j gjzz
+  normal! zz
-nnoremap k gkzz
+
-nnoremap # #zz
+  " Fix position of cursor at end of line
-nnoremap * *zz
+  if at_end
-nnoremap n nzz
+    let cursor_pos = getcursorcharpos()
-nnoremap N Nzz
+    let cursor_pos[2] = cursor_pos[2] + 1
-nnoremap gg ggzz
+    call setcursorcharpos(cursor_pos[1:])
-nnoremap G Gzz
+  endif
-nnoremap gj jzz
+endfunction
-nnoremap gk kzz
-vnoremap < <gv
-vnoremap > >gv

after/plugin/coc.vim

@@ -1,20 +0,0 @@
-if exists(":CocAction")
-  set signcolumn=yes
-  map <silent> gd <Plug>(coc-definition)
-
-  map <silent> <M-=> <cmd>call CocAction("doHover")<cr>
-  map <silent> <Leader>t <Plug>(coc-type-definition)
-  map <silent> <Leader>u <Plug>(coc-references)
-  map <silent> <Leader>r <Plug>(coc-rename)
-  map <silent> <Leader>q <Plug>(coc-quickfix)
-
-  map <silent> <Leader>F <Plug>(coc-format)
-  map <silent> <Leader>f <Plug>(coc-format-selected)
-  vmap <silent> <Leader>f <Plug>(coc-format-selected)
-
-  map <silent> <M-a> <Plug>(coc-codeaction)
-  vmap <silent> <M-a> <Plug>(coc-codeaction-selected)
-
-  omap <silent> af <Plug>(coc-funcobj-a)
-  omap <silent> if <Plug>(coc-funcobj-i)
-endif

after/plugin/compe.vim

@@ -1,7 +0,0 @@
-if exists('g:loaded_compe')
-	inoremap <silent><expr> <C-Space> compe#complete()
-	inoremap <silent><expr> <CR>      compe#confirm('<CR>')
-	inoremap <silent><expr> <C-e>     compe#close('<C-e>')
-	inoremap <silent><expr> <C-f>     compe#scroll({ 'delta': +4 })
-	inoremap <silent><expr> <C-d>     compe#scroll({ 'delta': -4 })
-endif

after/plugin/deepl.vim

@@ -1,10 +0,0 @@
-let g:deepl#endpoint = "https://api-free.deepl.com/v2/translate"
-function TranslateSelection(lang)
-	if !exists('g:deepl#auth_key')
-		let g:deepl#auth_key = pass#get('web/deepl.com', 'apikey')
-	endif
-	call deepl#v(a:lang)
-endfun
-
-vmap <leader><C-e> <Cmd>call TranslateSelection("EN")<CR>
-vmap <leader><C-d> <Cmd>call TranslateSelection("DE")<CR>

after/plugin/general.vim

@@ -1,19 +0,0 @@
-let g:deoplete#enable_at_startup = 1
-if !exists('g:deoplete#omni#input_patterns')
-  let g:deoplete#omni#input_patterns = {}
-endif
-
-" <C-h>, <BS>: close popup and delete backword char.
-"inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
-"inoremap <expr><BS>  deoplete#smart_close_popup()."\<C-h>"
-
-"inoremap <silent><expr> <TAB>
-"      \ pumvisible() ? "\<C-n>" :
-"      \ <SID>check_back_space() ? "\<TAB>" :
-"      \ '\<C-x><C-o>'
-
-function! s:check_back_space()
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~ '\s'
-endfunction
-"inoremap <silent> <c-space> <C-x><C-o>

after/plugin/nvim-metals.vim

@@ -1,2 +0,0 @@
-":let g:metals_server_version = '0.10.6-M1+29-22f5a4b1-SNAPSHOT'
-"let g:metals_server_version = '0.10.6-M1'

after/plugin/syntastic.vim

@@ -1,7 +0,0 @@
-
-hi SyntasticErrorLine  ctermbg=52  ctermfg=fg  cterm=NONE
-hi SyntasticWarningLine   ctermbg=234 ctermfg=fg  cterm=NONE
-
-let g:syntastic_tex_chktex_showmsg = 0
-let g:syntastic_tex_chktex_args = '-n 1 -n 11'
-let g:syntastic_tex_checkers = ['chktex']

after/plugin/tabline.vim

@@ -1,45 +0,0 @@
-function MyTabLine()
-	let s = ''
-	let t = tabpagenr()
-	let i = 1
-	while i <= tabpagenr('$')
-		let buflist = tabpagebuflist(i)
-		let winnr = tabpagewinnr(i)
-		let s .= '%' . i . 'T'
-		let s .= (i == t ? '%2*' : '%1*')
-		let s .= ' '
-		let s .= i . ':'
-		let s .= winnr . '/' . tabpagewinnr(i,'$')
-
-		let bufnrlist = tabpagebuflist(i)
-		for bufnr in bufnrlist
-			if getbufvar(bufnr, "&modified")
-				let s .= '+'
-				break
-			endif
-		endfor
-
-		let s .= ' %*'
-		let s .= (i == t ? '%#TabLineSel#' : '%#TabLine#')
-		let bufnr = buflist[winnr - 1]
-		let file = bufname(bufnr)
-		let buftype = getbufvar(bufnr, 'buftype')
-		if buftype == 'nofile'
-			if file =~ '\/.'
-				let file = substitute(file, '.*\/\ze.', '', '')
-			endif
-		else
-			let file = fnamemodify(file, ':p:t')
-		endif
-		if file == ''
-			let file = '[No Name]'
-		endif
-		let s .= file
-		let i = i + 1
-	endwhile
-	let s .= '%T%#TabLineFill#%='
-	let s .= (tabpagenr('$') > 1 ? '%999XX' : 'X')
-	return s
-endfunction
-set stal=2
-set tabline=%!MyTabLine()

after/plugin/vimtex.vim

@@ -1,4 +0,0 @@
-let g:vimtex_quickfix_ignorefilters = [
-      \ 'overfull',
-      \ 'underfull',
-      \]

lua/plugins/init.lua

@@ -29,7 +29,6 @@ return {
 			require('lsp_signature').setup({})
 		end
 	},
-	'nvim-lua/lsp-status.nvim',
 	'kyazdani42/nvim-web-devicons',
 	'folke/trouble.nvim',
 	'folke/lsp-colors.nvim',
@@ -37,7 +36,6 @@ return {
 
 	'junegunn/vim-easy-align',
 	'machakann/vim-highlightedyank',
-	'vim-airline/vim-airline',
 	'lukas-reineke/indent-blankline.nvim',
 	'lambdalisue/suda.vim',
 	-- git
@@ -47,7 +45,13 @@ return {
 	'sjl/splice.vim',
 	'jamessan/vim-gnupg',
 
-	'lervag/vimtex',
+	{'lervag/vimtex',
+		init = function()
+			vim.g.tex_conceal="agm"
+			vim.g.vimtex_quickfix_ignorefilters = { 'overfull', 'underfull' }
+		end,
+		ft = "tex",
+	},
 	'ledger/vim-ledger',
 	'anekos/hledger-vim',
 

lua/plugins/lspconfig.lua

@@ -8,6 +8,7 @@ return {
       { "folke/neodev.nvim",  opts = {} },
       "mason.nvim",
       "williamboman/mason-lspconfig.nvim",
+      'nvim-lua/lsp-status.nvim',
       {
         "hrsh7th/cmp-nvim-lsp",
         cond = function()
@@ -16,7 +17,7 @@ return {
       },
     },
     ---@class PluginLspOpts
-    opts = {
+    opts = function() return {
       -- options for vim.diagnostic.config()
       diagnostics = {
         underline = true,
@@ -32,7 +33,7 @@ return {
         severity_sort = true,
       },
       -- add any global capabilities here
-      capabilities = {},
+      capabilities = { require'lsp-status'.capabilities },
       servers = {
         jsonls = {},
         lua_ls = {
@@ -71,7 +72,7 @@ return {
         -- Specify * to use this function as a fallback for any server
         -- ["*"] = function(server, opts) end,
       },
-    },
+    } end,
     ---@param opts PluginLspOpts
     config = function(_, opts)
       -- diagnostics
@@ -196,5 +197,11 @@ return {
     end,
   },
   'mfussenegger/nvim-jdtls',
+  {'nvim-lua/lsp-status.nvim',
+    config = function(_, opts)
+      local lsp_status = require('lsp-status')
+      lsp_status.register_progress()
+    end
+  }
 }
 

lua/plugins/tabline.lua

@@ -0,0 +1,74 @@
+local colors = {
+  blue = '#00afff',
+  lightblue = '#87afff',
+  orange = '#ffaf5f',
+  yellow = '#ffd75f',
+  green = '#87d75f',
+  red = '#ff0000',
+  lightred = '#ff5f5f',
+  white = '#ffffff',
+  lightgray = '#c6c6c6',
+  gray = '#6a6a6a',
+  bggray = '#1c1c1c',
+  lightbggray = '#262626',
+  visualgray = '#303030',
+  black = '#000000',
+  normfg = '#ffffff',
+  normbg = '#000000',
+}
+
+return {
+  'hoob3rt/lualine.nvim',
+  dependencies = {
+    {'kyazdani42/nvim-web-devicons', lazy = true },
+    'nvim-lua/lsp-status.nvim',
+  },
+  opts = {
+    options = {
+      theme = {
+        normal = {
+          a = { fg = colors.black, bg = colors.gray },
+          b = { fg = colors.yellow, bg = colors.lightbggray },
+          c = { fg = colors.blue, bg = colors.bggray },
+          z = { fg = colors.yellow, bg = colors.gray },
+        },
+        inactive = {
+          a = { fg = colors.black, bg = colors.gray },
+          b = { fg = colors.red, bg = colors.lightbggray },
+          c = { fg = colors.gray, bg = colors.bggray },
+          z = { fg = colors.blue, bg = colors.gray },
+        },
+        insert = { a = { fg = colors.black, bg = colors.green } },
+        visual = { a = { fg = colors.black, bg = colors.yellow } },
+        replace = { a = { fg = colors.black, bg = colors.red } },
+      }
+    },
+    tabline = {
+      lualine_a = { 'branch' },
+      lualine_b = {},
+      lualine_c = { 'windows' },
+      lualine_x = {},
+      lualine_y = {},
+      lualine_z = { 'tabs' }
+    },
+    sections = {
+      lualine_a = { 'filename' },
+      lualine_b = { 'diff', 'diagnostics' },
+      lualine_c = {},
+      lualine_x = { "require'lsp-status'.status()" },
+      lualine_y = { 'filetype' },
+      lualine_z = { 'searchcount', 'location' }
+    },
+    inactive_sections = {
+      lualine_a = {},
+      lualine_b = {},
+      lualine_c = { 'filename' },
+      lualine_x = { 'location' },
+      lualine_y = {},
+      lualine_z = {}
+    },
+    winbar = {},
+    inactive_winbar = {},
+    extensions = {}
+  }
+}

lua/plugins/treesitter.lua

@@ -76,13 +76,28 @@ return {
           end
           added[lang] = true
           return true
-        end, opts.ensure_installed)
+        end, opts.ensure_installed --[[@as string[] ]])
       end
       require("nvim-treesitter.configs").setup(opts)
     end,
   },
   { 'nvim-treesitter/playground',
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
     cmd = 'TSPlaygroundToggle'
   },
+  { "nvim-treesitter/nvim-treesitter-context",
+    event = "VeryLazy",
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    cmd = { 'TSContextEnable', 'TSContextDisable', 'TSContextToggle' },
+    keys = {
+      { "[c", function() require("treesitter-context").go_to_context() end, desc = "Go to context start" },
+    },
+    opts = { enable = true },
+    config = function(_, opts)
+      require'treesitter-context'.setup(opts)
+      vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = "#555555" })
+      vim.api.nvim_set_hl(0, 'TreesitterContextLineNumber', { link = "Special" })
+    end,
+  }
 
 }