changeset 514:f0c94c3f5fd9

Use new user_command api to define commands
author zegervdv <zegervdv@me.com>
date Wed, 29 Dec 2021 11:44:10 +0100
parents 2476af02ba12
children 67a4228c6532
files .chezmoitemplates/config.vim .chezmoitemplates/init.lua
diffstat 2 files changed, 28 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/.chezmoitemplates/config.vim	Tue Dec 28 11:43:51 2021 +0100
+++ b/.chezmoitemplates/config.vim	Wed Dec 29 11:44:10 2021 +0100
@@ -586,41 +586,8 @@
 " Plugin settings
 " Gundo tree
 nnoremap <leader>u :GundoToggle<CR>
-"
-" Projectionist
-let g:projectionist_heuristics = {
-      \ "*.c": {
-      \   "*.c": {
-      \     "alternate": "{}.h",
-      \     "type": "source",
-      \     "template": ["#include \"{}.h\""],
-      \     "make": "make -wC {project}"
-      \   },
-      \   "*.h": {
-      \     "alternate": "{}.c",
-      \     "type": "header",
-      \     "template": ["#ifndef {uppercase}_H", "#define {uppercase}_H", "", "#endif"]
-      \   },
-      \   "Makefile": {"type": "makefile"},
-      \ },
-      \ "*.py": {
-      \   "*.py": { "make": "ipython {}" }
-      \ },
-      \ }
-"
-" Grep
-let g:grepper = {
-      \ 'tools': ['ag', 'hg'],
-      \ 'highlight': 1,
-      \ 'ag': {
-      \  'grepprg': 'rg --vimgrep',
-      \ }}
-
-nnoremap gs <plug>(GrepperOperator)
-xnoremap gs <plug>(GrepperOperator)
 
 
-command! -nargs=* -complete=file Ag Grepper -noprompt -tool ag -grepprg rg --vimgrep <args>
 "
 " Vinegar/NetRW
 autocmd FileType netrw setl bufhidden=delete
--- a/.chezmoitemplates/init.lua	Tue Dec 28 11:43:51 2021 +0100
+++ b/.chezmoitemplates/init.lua	Wed Dec 29 11:44:10 2021 +0100
@@ -166,7 +166,33 @@
   use { 'wellle/targets.vim', event = 'InsertEnter *' }
 
   -- Searching
-  use { 'mhinz/vim-grepper', cmd = { 'Grepper' } }
+  use {
+    'mhinz/vim-grepper',
+    cmd = { 'Grepper', 'Ag' },
+    keys = { { 'n', 'gs' }, { 'x', 'gs' } },
+    config = function()
+      local nmap = vim.keymap.nmap
+      local xmap = vim.keymap.xmap
+
+      vim.g.grepper = {
+        tools = { 'ag', 'hg' },
+        highlight = 1,
+        ag = {
+          grepprg = 'rg --vimgrep',
+        },
+      }
+
+      nmap { 'gs', '<plug>(GrepperOperator)' }
+      xmap { 'gs', '<plug>(GrepperOperator)' }
+    end,
+    setup = function()
+      vim.api.nvim_add_user_command(
+        'Ag',
+        'Grepper -noprompt -tool ag -grepprg rg --vimgrep <args>',
+        { complete = 'file', nargs = '*' }
+      )
+    end,
+  }
 
   -- Keymaps TODO: to be removed when #13823 is merged
   use {
@@ -794,7 +820,7 @@
   end)
 end
 
-vim.cmd [[command! LspRename lua LspRename()]]
+vim.api.nvim_add_user_command('LspRename', LspRename, {})
 
 vim.diagnostic.config {
   underline = true,