From 2d7d6840991ebcc408ab0bbe2c468225384212d1 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Mon, 26 Dec 2022 19:57:49 +0100 Subject: [PATCH] chore(nvim): add Pandoc plugins --- nvim/lazy-lock.json | 2 ++ nvim/lua/kogakure/autocommands.lua | 37 +++++++++++++++++------------- nvim/lua/kogakure/plugins.lua | 2 ++ 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c8891c3..9c02010 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -116,6 +116,8 @@ "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" }, "vim-grammarous": { "branch": "master", "commit": "db46357465ce587d5325e816235b5e92415f8c05" }, "vim-matchup": { "branch": "master", "commit": "db5120dd9887c988de7cd973ddb951e465d413e5" }, + "vim-pandoc": { "branch": "master", "commit": "7dbda1c885c4c5dd3f865aa29e1b82167663aeec" }, + "vim-pandoc-syntax": { "branch": "master", "commit": "2baeabb9584bb948618806f22bc4cef5685535fc" }, "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-table-mode": { "branch": "master", "commit": "9555a3e6e5bcf285ec181b7fc983eea90500feb4" }, diff --git a/nvim/lua/kogakure/autocommands.lua b/nvim/lua/kogakure/autocommands.lua index 25a7560..fe0f392 100644 --- a/nvim/lua/kogakure/autocommands.lua +++ b/nvim/lua/kogakure/autocommands.lua @@ -1,5 +1,5 @@ vim.cmd([[ - augroup _general_settings + augroup general_settings autocmd! autocmd FileType qf,help,man,lspinfo nnoremap q :close autocmd BufWinEnter * :set formatoptions-=cro @@ -7,13 +7,13 @@ vim.cmd([[ augroup end " Automatically highlight yanked content - augroup _highlight_yank + augroup highlight_yank autocmd! autocmd TextYankPost * silent! lua vim.highlight.on_yank({higroup = 'Visual', timeout = 700}) augroup END " Remember cursor position - augroup _line_return + augroup line_return autocmd! autocmd BufReadPost * \ if line("'\"") > 1 && line("'\"") <= line("$") | @@ -21,25 +21,30 @@ vim.cmd([[ \ endif augroup END - augroup _git + augroup git autocmd! autocmd FileType gitcommit setlocal wrap autocmd FileType gitcommit setlocal spell autocmd BufRead,BufNewFile COMMIT_EDITMSG setfiletype git augroup end - augroup _markdown + augroup markdown autocmd! autocmd FileType markdown setlocal wrap augroup end - augroup _ft_html + augroup pandoc_syntax + autocmd! BufNewFile,BufFilePre,BufRead *.md set filetype=markdown.pandoc + autocmd FileType markdown.pandoc setlocal nospell + augroup END + + augroup ft_html autocmd! autocmd FileType html,eruby,njk setlocal foldmethod=indent autocmd FileType html,eruby,njk setlocal omnifunc=htmlcomplete#CompleteTags augroup END - augroup _ft_css + augroup ft_css autocmd! autocmd FileType css setlocal foldmethod=marker autocmd FileType scss,sass,less,stylus setlocal foldmethod=indent @@ -48,13 +53,13 @@ vim.cmd([[ autocmd Filetype css,scss,sass,less,stylus setlocal iskeyword+=- augroup END - augroup _ft_xml + augroup ft_xml autocmd! autocmd FileType xml setlocal foldmethod=indent autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags augroup END - augroup _ft_javascript + augroup ft_javascript autocmd! autocmd FileType javascript setlocal foldmethod=indent autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS @@ -62,13 +67,13 @@ vim.cmd([[ autocmd BufRead,BufNewFile *.jsx setfiletype javascript.jsx augroup END - augroup _ft_json + augroup ft_json autocmd! autocmd FileType json syntax match Comment +\/\/.\+$+ autocmd Filetype json setlocal ts=2 sts=2 sw=2 augroup END - augroup _ft_ruby + augroup ft_ruby autocmd! autocmd FileType ruby setlocal foldmethod=syntax autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete @@ -77,12 +82,12 @@ vim.cmd([[ autocmd FileType ruby let g:rubycomplete_classes_in_global = 1 augroup END - augroup _ft_vim + augroup ft_vim autocmd! autocmd FileType vim setlocal foldmethod=marker augroup END - augroup _ft_misc + augroup ft_misc autocmd! autocmd BufNewFile,BufRead *.handlebars set filetype=html syntax=handlebars autocmd BufNewFile,BufRead *.hb set filetype=html syntax=handlebars @@ -96,17 +101,17 @@ vim.cmd([[ autocmd BufLeave *.{js,jsx,ts,tsx} :syntax sync clear augroup END - augroup _auto_resize + augroup auto_resize autocmd! autocmd VimResized * tabdo wincmd = augroup end - augroup _alpha + augroup alpha autocmd! autocmd User AlphaReady set showtabline=0 | autocmd BufUnload set showtabline=2 augroup end - augroup _lsp + augroup lsp autocmd! autocmd BufWritePre * lua vim.lsp.buf.format() augroup end diff --git a/nvim/lua/kogakure/plugins.lua b/nvim/lua/kogakure/plugins.lua index 8ad9787..c4477cd 100644 --- a/nvim/lua/kogakure/plugins.lua +++ b/nvim/lua/kogakure/plugins.lua @@ -152,6 +152,8 @@ local plugins = { "rlane/pounce.nvim", -- Incremental fuzzy search motion "echasnovski/mini.nvim", -- Library with 20+ plugins "dhruvasagar/vim-table-mode", -- Markdown table mode + "vim-pandoc/vim-pandoc", -- Pandoc + "vim-pandoc/vim-pandoc-syntax", -- Pandoc syntax -- Custom Text Objects "chrisgrieser/nvim-various-textobjs", -- Various text objects