vim: update 2021-02-23T13:26:28Z+01:00

8 files changed, 52 insertions, 19 deletions

diff --git a/.vim/colors/nihoncolors.vim b/.vim/colors/nihoncolors.vim
index 51056b8..1919466 100644
--- a/.vim/colors/nihoncolors.vim
+++ b/.vim/colors/nihoncolors.vim
@@ -72,7 +72,7 @@ call s:create_color_variables('cursor_fg', color00)
 call s:create_color_variables('cursor_bg', color15)
 
 call s:create_color_variables('cursorline',        color00)
-call s:create_color_variables('cursorcolumn',      color00)
+call s:create_color_variables('cursorcolumn',      color05)
 call s:create_color_variables('cursorlinenr_fg',   color13)
 call s:create_color_variables('cursorlinenr_bg',   color00)
 
@@ -196,7 +196,7 @@ if version >= 700
     endif
 end
 if version >= 703
-    exec 'hi ColorColumn'  . s:bg_cursorcolumn . s:ft_none
+    exec 'hi ColorColumn'  . ' guibg=#292929 ' . s:ft_none
 end
 
 exec 'hi TabLine' . s:fg_tabline_inactive_fg . s:bg_tabline_inactive_bg . s:ft_none
diff --git a/.vim/ftplugin/go.lua b/.vim/ftplugin/go.lua
new file mode 100644
index 0000000..74d6bf1
--- /dev/null
+++ b/.vim/ftplugin/go.lua
@@ -0,0 +1,16 @@
+local g = vim.g
+
+-- local eval = vim.api.nvim_eval
+-- if eval("exists('g:loaded_neomake')") then
+--   g.neomake_go_build_maker = {
+--     exe = 'go',
+--     args = 'build',
+--     append_file = 0,
+--   }
+--   g.neomake_go_enabled_makers = { 'go', 'golangci_lint' }
+-- end
+
+require('utils').augroup2 {
+  neoformat_go = {{ 'BufWritePre', '*.go', 
+    'try | undojoin | Neoformat | catch | echoerr Neoformat\\ failed | endtry' }}
+}
diff --git a/.vim/ftplugin/tex.lua b/.vim/ftplugin/tex.lua
new file mode 100644
index 0000000..723d992
--- /dev/null
+++ b/.vim/ftplugin/tex.lua
@@ -0,0 +1 @@
+vim.bo.makeprg = 'latexmk -1 -n %'
diff --git a/.vim/init.lua b/.vim/init.lua
index 419bf0b..62cb9a3 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -12,6 +12,7 @@ local u = require('utils')
 
 -- OPTIONS -- {{{
 cmd('set clipboard+=unnamedplus')
+u.opt('o', 'title', true)
 u.opt('o', 'shiftround', true)
 u.opt('o', 'termguicolors', true)
 u.opt('o', 'incsearch', true)
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 4830b4b..6ec9e61 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -43,7 +43,7 @@ return require'packer'.startup(function()
 	use {'cohama/lexima.vim'}      -- auto-close parens, brackets, etc.
 	use {'tpope/vim-surround'}     -- edit surroundings in pairs
 	-- use {'neomake/neomake'}        -- async job runner
-	-- use {'sbdchd/neoformat'}       -- async code formatter
+	use {'sbdchd/neoformat'}       -- async code formatter
 	use {'justinmk/vim-dirvish'}   -- folder browser
 	use {'justinmk/vim-sneak',
 		config = "vim.g['sneak#label'] = true"
diff --git a/.vim/lua/plugins/_lsp.lua b/.vim/lua/plugins/_lsp.lua
index 9d98aca..780f703 100644
--- a/.vim/lua/plugins/_lsp.lua
+++ b/.vim/lua/plugins/_lsp.lua
@@ -1,8 +1,9 @@
 -- lsp config
 
-local lsp     = require('lspconfig')
-local util    = require('lspconfig.util')
-local u       = require('utils')
+local lsp      = require('lspconfig')
+local util     = require('lspconfig.util')
+local u        = require('utils')
+local nnoremap = require('astronauta.keymap').nnoremap
 
 -- https://github.com/kosayoda/nvim-lightbulb
 require('nvim-lightbulb').update_lightbulb {
@@ -22,12 +23,12 @@ local my_attach = function(client)
 	require 'completion'.on_attach(client)
 
 	-- lsp mappings
-	u.map('n', 'K',     '<cmd>lua vim.lsp.buf.hover()<cr>')
-	u.map(0, 'n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<cr>')
-	u.map(0, 'n', 'grr',   '<cmd>lua vim.lsp.buf.rename()<cr>')
-	u.map(0, 'i', '<c-h>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-	u.map(0, 'n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<cr>')
-	u.map(0, 'n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>')
+	nnoremap { 'K', function() vim.lsp.buf.hover() end }
+	nnoremap { '<C-]>', function() vim.lsp.buf.definition() end }
+	nnoremap { 'grr',   function() vim.lsp.buf.rename() end }
+	nnoremap { '<c-h>', function() vim.lsp.buf.signature_help() end }
+	nnoremap { ']d', function() vim.lsp.diagnostic.goto_next() end }
+	nnoremap { '[d', function() vim.lsp.diagnostic.goto_prev() end }
 
 	-- nnoremap <silent> gD <cmd> lua vim.lsp.buf.declaration()<CR>
 	-- nnoremap <silent> gd <cmd> lua vim.lsp.buf.definition()<CR>
diff --git a/.vim/lua/utils.lua b/.vim/lua/utils.lua
index ab7793f..271d593 100644
--- a/.vim/lua/utils.lua
+++ b/.vim/lua/utils.lua
@@ -26,6 +26,16 @@ M.augroup = function(name, autocmds)
 	end
 	vim.cmd('augroup END')
 end
+M.augroup2 = function(tbl)
+	for name, autocmds in pairs(tbl) do
+		vim.cmd('augroup ' .. name)
+		vim.cmd('autocmd!')
+		for _, au in ipairs(autocmds) do
+			vim.cmd('autocmd ' .. table.concat(au, ' '))
+		end
+		vim.cmd('augroup END')
+	end
+end
 
 M.def = function(name, cmd, ...)
 	local opts = table.concat((... or {}), ' ')
diff --git a/.vim/plugin/packer_compiled.vim b/.vim/plugin/packer_compiled.vim
index a663292..36bdfe6 100644
--- a/.vim/plugin/packer_compiled.vim
+++ b/.vim/plugin/packer_compiled.vim
@@ -76,6 +76,10 @@ _G.packer_plugins = {
     needs_bufread = false,
     path = "/home/robert/.local/share/nvim/site/pack/packer/opt/limelight.vim"
   },
+  neoformat = {
+    loaded = true,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/start/neoformat"
+  },
   ["nvim-colorizer.lua"] = {
     config = { "require('plugins._colorizer')" },
     loaded = true,
@@ -204,22 +208,22 @@ _G.packer_plugins = {
   }
 }
 
--- Config for: telescope.nvim
-require('plugins._telescope')
+-- Config for: nvim-treesitter
+require('plugins._treesitter')
 -- Config for: completion-nvim
 require('plugins._completion')
 -- Config for: nvim-colorizer.lua
 require('plugins._colorizer')
--- Config for: nvim-treesitter
-require('plugins._treesitter')
+-- Config for: vim-sneak
+vim.g['sneak#label'] = true
 -- Config for: vim-indent-guides
 require('plugins._indent-guides')
 -- Config for: vim-signify
 require('plugins._signify')
 -- Config for: git-messenger.vim
 require('plugins._git-messenger')
--- Config for: vim-sneak
-vim.g['sneak#label'] = true
+-- Config for: telescope.nvim
+require('plugins._telescope')
 -- Config for: ultisnips
 require('plugins._ultisnips')
 -- Config for: nvim-lspconfig
@@ -232,7 +236,7 @@ vim.cmd [[command! -nargs=* -range -bang -complete=file Goyo lua require("packer
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]
   -- Filetype lazy-loads
-vim.cmd [[au FileType markdown ++once lua require("packer.load")({'vim-markdown-folding', 'vim-markdown'}, { ft = "markdown" }, _G.packer_plugins)]]
+vim.cmd [[au FileType markdown ++once lua require("packer.load")({'vim-markdown', 'vim-markdown-folding'}, { ft = "markdown" }, _G.packer_plugins)]]
 vim.cmd [[au FileType cue ++once lua require("packer.load")({'vim-cue'}, { ft = "cue" }, _G.packer_plugins)]]
 vim.cmd [[au FileType latex ++once lua require("packer.load")({'vimtex'}, { ft = "latex" }, _G.packer_plugins)]]
 vim.cmd [[au FileType tex ++once lua require("packer.load")({'vimtex'}, { ft = "tex" }, _G.packer_plugins)]]