From 2d5fac776a5f935da929efa92a502af022c7db2e Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Thu, 12 Jan 2023 14:45:27 +0530 Subject: [PATCH] nvim: after/ftplugin: Move from vim to lua --- nvim/.config/nvim/after/ftplugin/config.lua | 2 ++ nvim/.config/nvim/after/ftplugin/config.vim | 2 -- nvim/.config/nvim/after/ftplugin/diff.lua | 4 ++++ nvim/.config/nvim/after/ftplugin/diff.vim | 5 ----- nvim/.config/nvim/after/ftplugin/dockerfile.lua | 6 ++++++ nvim/.config/nvim/after/ftplugin/dockerfile.vim | 1 - nvim/.config/nvim/after/ftplugin/fish.lua | 8 ++++++++ nvim/.config/nvim/after/ftplugin/fish.vim | 3 --- .../nvim/after/ftplugin/fugitiveblame.lua | 1 + .../nvim/after/ftplugin/fugitiveblame.vim | 1 - nvim/.config/nvim/after/ftplugin/gitcommit.lua | 5 +++++ nvim/.config/nvim/after/ftplugin/gitcommit.vim | 7 ------- nvim/.config/nvim/after/ftplugin/gitconfig.lua | 1 + nvim/.config/nvim/after/ftplugin/gitconfig.vim | 1 - nvim/.config/nvim/after/ftplugin/help.lua | 3 +++ nvim/.config/nvim/after/ftplugin/help.vim | 2 -- nvim/.config/nvim/after/ftplugin/json.lua | 1 + nvim/.config/nvim/after/ftplugin/json.vim | 1 - nvim/.config/nvim/after/ftplugin/lua.lua | 6 ++++++ nvim/.config/nvim/after/ftplugin/lua.vim | 1 - nvim/.config/nvim/after/ftplugin/man.lua | 2 ++ nvim/.config/nvim/after/ftplugin/man.vim | 2 -- nvim/.config/nvim/after/ftplugin/markdown.lua | 6 ++++++ nvim/.config/nvim/after/ftplugin/markdown.vim | 3 --- nvim/.config/nvim/after/ftplugin/meson.lua | 2 ++ nvim/.config/nvim/after/ftplugin/meson.vim | 2 -- nvim/.config/nvim/after/ftplugin/purescript.lua | 2 ++ nvim/.config/nvim/after/ftplugin/purescript.vim | 2 -- nvim/.config/nvim/after/ftplugin/python.lua | 12 ++++++++++++ nvim/.config/nvim/after/ftplugin/python.vim | 6 ------ nvim/.config/nvim/after/ftplugin/rust.lua | 16 ++++++++++++++++ nvim/.config/nvim/after/ftplugin/rust.vim | 10 ---------- nvim/.config/nvim/after/ftplugin/text.lua | 1 + nvim/.config/nvim/after/ftplugin/text.vim | 1 - 34 files changed, 78 insertions(+), 50 deletions(-) create mode 100644 nvim/.config/nvim/after/ftplugin/config.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/config.vim create mode 100644 nvim/.config/nvim/after/ftplugin/diff.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/diff.vim create mode 100644 nvim/.config/nvim/after/ftplugin/dockerfile.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/dockerfile.vim create mode 100644 nvim/.config/nvim/after/ftplugin/fish.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/fish.vim create mode 100644 nvim/.config/nvim/after/ftplugin/fugitiveblame.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/fugitiveblame.vim create mode 100644 nvim/.config/nvim/after/ftplugin/gitcommit.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/gitcommit.vim create mode 100644 nvim/.config/nvim/after/ftplugin/gitconfig.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/gitconfig.vim create mode 100644 nvim/.config/nvim/after/ftplugin/help.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/help.vim create mode 100644 nvim/.config/nvim/after/ftplugin/json.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/json.vim create mode 100644 nvim/.config/nvim/after/ftplugin/lua.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/lua.vim create mode 100644 nvim/.config/nvim/after/ftplugin/man.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/man.vim create mode 100644 nvim/.config/nvim/after/ftplugin/markdown.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/markdown.vim create mode 100644 nvim/.config/nvim/after/ftplugin/meson.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/meson.vim create mode 100644 nvim/.config/nvim/after/ftplugin/purescript.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/purescript.vim delete mode 100644 nvim/.config/nvim/after/ftplugin/python.vim delete mode 100644 nvim/.config/nvim/after/ftplugin/rust.vim create mode 100644 nvim/.config/nvim/after/ftplugin/text.lua delete mode 100644 nvim/.config/nvim/after/ftplugin/text.vim diff --git a/nvim/.config/nvim/after/ftplugin/config.lua b/nvim/.config/nvim/after/ftplugin/config.lua new file mode 100644 index 0000000..aa20136 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/config.lua @@ -0,0 +1,2 @@ +vim.bo.textwidth = 0 +vim.bo.wrapmargin = 0 diff --git a/nvim/.config/nvim/after/ftplugin/config.vim b/nvim/.config/nvim/after/ftplugin/config.vim deleted file mode 100644 index 17d4593..0000000 --- a/nvim/.config/nvim/after/ftplugin/config.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal textwidth=0 -setlocal wrapmargin=0 diff --git a/nvim/.config/nvim/after/ftplugin/diff.lua b/nvim/.config/nvim/after/ftplugin/diff.lua new file mode 100644 index 0000000..4d4f396 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/diff.lua @@ -0,0 +1,4 @@ +vim.bo.spell = false + +vim.keymap.set('n', '[c', "?^@@", { noremap=true, silent=true, buffer=0 }) +vim.keymap.set('n', ']c', "/^@@", { noremap=true, silent=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/diff.vim b/nvim/.config/nvim/after/ftplugin/diff.vim deleted file mode 100644 index cb94875..0000000 --- a/nvim/.config/nvim/after/ftplugin/diff.vim +++ /dev/null @@ -1,5 +0,0 @@ -setlocal nospell - -" Jump to sections of diff -nnoremap [c ?^@@ -nnoremap ]c /^@@ diff --git a/nvim/.config/nvim/after/ftplugin/dockerfile.lua b/nvim/.config/nvim/after/ftplugin/dockerfile.lua new file mode 100644 index 0000000..6d197de --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/dockerfile.lua @@ -0,0 +1,6 @@ +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + buffer = 0, + callback = function() + require("lint").try_lint() + end, +}) diff --git a/nvim/.config/nvim/after/ftplugin/dockerfile.vim b/nvim/.config/nvim/after/ftplugin/dockerfile.vim deleted file mode 100644 index 61b273c..0000000 --- a/nvim/.config/nvim/after/ftplugin/dockerfile.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd! BufWritePost lua require('lint').try_lint() diff --git a/nvim/.config/nvim/after/ftplugin/fish.lua b/nvim/.config/nvim/after/ftplugin/fish.lua new file mode 100644 index 0000000..913ef24 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/fish.lua @@ -0,0 +1,8 @@ +vim.keymap.set('n', 'gq', ":%!fish_indent %:w", { noremap=true, silent=true, buffer=0 }) + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + buffer = 0, + callback = function() + require("lint").try_lint() + end, +}) diff --git a/nvim/.config/nvim/after/ftplugin/fish.vim b/nvim/.config/nvim/after/ftplugin/fish.vim deleted file mode 100644 index 4c01bfc..0000000 --- a/nvim/.config/nvim/after/ftplugin/fish.vim +++ /dev/null @@ -1,3 +0,0 @@ -nnoremap gq :silent :%!fish_indent %:w - -autocmd! BufWritePost lua require('lint').try_lint() diff --git a/nvim/.config/nvim/after/ftplugin/fugitiveblame.lua b/nvim/.config/nvim/after/ftplugin/fugitiveblame.lua new file mode 100644 index 0000000..ffec6e1 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/fugitiveblame.lua @@ -0,0 +1 @@ +vim.keymap.set('n', 'q', ":bwipeout!", { noremap=true, silent=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim b/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim deleted file mode 100644 index 8fd8802..0000000 --- a/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim +++ /dev/null @@ -1 +0,0 @@ -nnoremap q :bwipeout! diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.lua b/nvim/.config/nvim/after/ftplugin/gitcommit.lua new file mode 100644 index 0000000..2838634 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/gitcommit.lua @@ -0,0 +1,5 @@ +vim.bo.textwidth = 72 +vim.bo.bufhidden = 'wipe' + +vim.keymap.set('n', '[c', "?^@@", { noremap=true, silent=true, buffer=0 }) +vim.keymap.set('n', ']c', "/^@@", { noremap=true, silent=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.vim b/nvim/.config/nvim/after/ftplugin/gitcommit.vim deleted file mode 100644 index 00860bf..0000000 --- a/nvim/.config/nvim/after/ftplugin/gitcommit.vim +++ /dev/null @@ -1,7 +0,0 @@ -setlocal textwidth=72 -setlocal iskeyword+=- -setlocal bufhidden=wipe - -" Jump to sections of diff -nnoremap [c ?^@@ -nnoremap ]c /^@@ diff --git a/nvim/.config/nvim/after/ftplugin/gitconfig.lua b/nvim/.config/nvim/after/ftplugin/gitconfig.lua new file mode 100644 index 0000000..f5c2ed7 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/gitconfig.lua @@ -0,0 +1 @@ +vim.bo.bufhidden = 'wipe' diff --git a/nvim/.config/nvim/after/ftplugin/gitconfig.vim b/nvim/.config/nvim/after/ftplugin/gitconfig.vim deleted file mode 100644 index efc86a7..0000000 --- a/nvim/.config/nvim/after/ftplugin/gitconfig.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal bufhidden=wipe diff --git a/nvim/.config/nvim/after/ftplugin/help.lua b/nvim/.config/nvim/after/ftplugin/help.lua new file mode 100644 index 0000000..5ffb461 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/help.lua @@ -0,0 +1,3 @@ +vim.bo.bufhidden = 'wipe' + +vim.keymap.set('n', 'q', ":bwipeout!", { noremap=true, silent=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/help.vim b/nvim/.config/nvim/after/ftplugin/help.vim deleted file mode 100644 index a4500b8..0000000 --- a/nvim/.config/nvim/after/ftplugin/help.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal bufhidden=wipe -nnoremap q :bwipeout! diff --git a/nvim/.config/nvim/after/ftplugin/json.lua b/nvim/.config/nvim/after/ftplugin/json.lua new file mode 100644 index 0000000..0993f3c --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/json.lua @@ -0,0 +1 @@ +vim.keymap.set('n', 'gq', ":%!jq '.'", { noremap=true, silent=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/json.vim b/nvim/.config/nvim/after/ftplugin/json.vim deleted file mode 100644 index 812f1b1..0000000 --- a/nvim/.config/nvim/after/ftplugin/json.vim +++ /dev/null @@ -1 +0,0 @@ -nnoremap gq :silent %!jq '.' diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..6d197de --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,6 @@ +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + buffer = 0, + callback = function() + require("lint").try_lint() + end, +}) diff --git a/nvim/.config/nvim/after/ftplugin/lua.vim b/nvim/.config/nvim/after/ftplugin/lua.vim deleted file mode 100644 index 61b273c..0000000 --- a/nvim/.config/nvim/after/ftplugin/lua.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd! BufWritePost lua require('lint').try_lint() diff --git a/nvim/.config/nvim/after/ftplugin/man.lua b/nvim/.config/nvim/after/ftplugin/man.lua new file mode 100644 index 0000000..28872d6 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/man.lua @@ -0,0 +1,2 @@ +vim.bo.bufhidden = 'wipe' +vim.bo.buflisted = false diff --git a/nvim/.config/nvim/after/ftplugin/man.vim b/nvim/.config/nvim/after/ftplugin/man.vim deleted file mode 100644 index 083bdd5..0000000 --- a/nvim/.config/nvim/after/ftplugin/man.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal bufhidden=wipe -setlocal nobuflisted diff --git a/nvim/.config/nvim/after/ftplugin/markdown.lua b/nvim/.config/nvim/after/ftplugin/markdown.lua new file mode 100644 index 0000000..4d847ef --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/markdown.lua @@ -0,0 +1,6 @@ +vim.bo.textwidth = 80 + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + buffer = 0, + command = 'Vale', +}) diff --git a/nvim/.config/nvim/after/ftplugin/markdown.vim b/nvim/.config/nvim/after/ftplugin/markdown.vim deleted file mode 100644 index f8186d7..0000000 --- a/nvim/.config/nvim/after/ftplugin/markdown.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal textwidth=80 - -autocmd! BufWritePost :Vale diff --git a/nvim/.config/nvim/after/ftplugin/meson.lua b/nvim/.config/nvim/after/ftplugin/meson.lua new file mode 100644 index 0000000..aa20136 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/meson.lua @@ -0,0 +1,2 @@ +vim.bo.textwidth = 0 +vim.bo.wrapmargin = 0 diff --git a/nvim/.config/nvim/after/ftplugin/meson.vim b/nvim/.config/nvim/after/ftplugin/meson.vim deleted file mode 100644 index 17d4593..0000000 --- a/nvim/.config/nvim/after/ftplugin/meson.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal textwidth=0 -setlocal wrapmargin=0 diff --git a/nvim/.config/nvim/after/ftplugin/purescript.lua b/nvim/.config/nvim/after/ftplugin/purescript.lua new file mode 100644 index 0000000..aa20136 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/purescript.lua @@ -0,0 +1,2 @@ +vim.bo.textwidth = 0 +vim.bo.wrapmargin = 0 diff --git a/nvim/.config/nvim/after/ftplugin/purescript.vim b/nvim/.config/nvim/after/ftplugin/purescript.vim deleted file mode 100644 index 17d4593..0000000 --- a/nvim/.config/nvim/after/ftplugin/purescript.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal textwidth=0 -setlocal wrapmargin=0 diff --git a/nvim/.config/nvim/after/ftplugin/python.lua b/nvim/.config/nvim/after/ftplugin/python.lua index a2a5996..a634e16 100644 --- a/nvim/.config/nvim/after/ftplugin/python.lua +++ b/nvim/.config/nvim/after/ftplugin/python.lua @@ -21,3 +21,15 @@ vim.lsp.start({ }, }, }) + +vim.bo.textwidth = 0 +vim.bo.formatprg = "black -q -" + +vim.keymap.set('n', 'gq', "ggVGgq", { noremap=true, silent=true, buffer=0 }) + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + buffer = 0, + callback = function() + require("lint").try_lint() + end, +}) diff --git a/nvim/.config/nvim/after/ftplugin/python.vim b/nvim/.config/nvim/after/ftplugin/python.vim deleted file mode 100644 index 26335b5..0000000 --- a/nvim/.config/nvim/after/ftplugin/python.vim +++ /dev/null @@ -1,6 +0,0 @@ -setlocal textwidth=0 -setlocal formatprg=black\ -q\ - - -nnoremap gq ggVGgq - -autocmd! BufWritePost lua require('lint').try_lint() diff --git a/nvim/.config/nvim/after/ftplugin/rust.lua b/nvim/.config/nvim/after/ftplugin/rust.lua index 256d2ab..a02628f 100644 --- a/nvim/.config/nvim/after/ftplugin/rust.lua +++ b/nvim/.config/nvim/after/ftplugin/rust.lua @@ -16,3 +16,19 @@ vim.lsp.start({ }, }, }) + +vim.cmd.compiler('cargo') +vim.bo.makeprg = 'cargo build --all' + +vim.keymap.set('n', 'cbb', ":Dispatch! cargo build" , { noremap=true, buffer=0 }) +vim.keymap.set('n', 'cbc', ":Dispatch! cargo clean" , { noremap=true, buffer=0 }) +vim.keymap.set('n', 'cbd', ":Dispatch! cargo doc" , { noremap=true, buffer=0 }) +vim.keymap.set('n', 'cdD', ":Dispatch! cargo doc --open", { noremap=true, buffer=0 }) +vim.keymap.set('n', 'cbu', ":Dispatch! cargo update" , { noremap=true, buffer=0 }) + +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + buffer = 0, + callback = function() + vim.lsp.buf.format({async=true}) + end, +}) diff --git a/nvim/.config/nvim/after/ftplugin/rust.vim b/nvim/.config/nvim/after/ftplugin/rust.vim deleted file mode 100644 index c1598e0..0000000 --- a/nvim/.config/nvim/after/ftplugin/rust.vim +++ /dev/null @@ -1,10 +0,0 @@ -compiler cargo -setlocal makeprg=cargo\ build\ --all - -nnoremap cbb :Dispatch! cargo build -nnoremap cbc :Dispatch! cargo clean -nnoremap cbd :Dispatch! cargo doc -nnoremap cbD :Dispatch! cargo doc --open -nnoremap cbu :Dispatch! cargo update - -autocmd! BufWritePre :lua vim.lsp.buf.format({async=true}) diff --git a/nvim/.config/nvim/after/ftplugin/text.lua b/nvim/.config/nvim/after/ftplugin/text.lua new file mode 100644 index 0000000..4e1dc8f --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/text.lua @@ -0,0 +1 @@ +vim.bo.textwidth = 80 diff --git a/nvim/.config/nvim/after/ftplugin/text.vim b/nvim/.config/nvim/after/ftplugin/text.vim deleted file mode 100644 index fb802f5..0000000 --- a/nvim/.config/nvim/after/ftplugin/text.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal textwidth=78