refactor(keymaps): replace utils.vim_cmd and utils.git_cmd with inline functions

Refactored keymap definitions to use inline functions instead of the removed utils.vim_cmd and utils.git_cmd helpers. This change improves clarity and reduces indirection in keymap configuration files. Also removed commented-out code and updated git command handling to use a new local lazy_git_cmd function.

Author: dcai

lua/dcai/keymaps/chat.lua

@@ -106,7 +106,6 @@ local keymap = {
     end,
     desc = 'chat finder',
   },
-  -- s = utils.vim_cmd('GpWhisper', 'speech to text'),
   ----------------------------------------------------------------------------
   --- Visual mode below
   ----------------------------------------------------------------------------

lua/dcai/keymaps/editthings.lua

@@ -79,7 +79,6 @@ local editthings_keymap = {
     function()
       -- require('fzf-lua').git_files({ cwd = '~/.config/nvim' })
       require('fzf-lua').files({ cwd = '~/.config/nvim' })
-      -- v = utils.vim_cmd('e ' .. vimrc_to_edit, 'edit vimrc')
     end,
     desc = 'toggle last used file',
   },

lua/dcai/keymaps/git.lua

@@ -1,5 +1,9 @@
 local utils = require('dcai.keymaps.utils')
 
+local function lazy_git_cmd(opts, desc)
+  return utils.lazy_shell_cmd('git', opts, desc)
+end
+
 local git_keymap = {
   { '<leader>g', group = 'git' },
   { '<leader>ga', '<cmd>!git add --verbose %<cr>', desc = 'git add' },
@@ -10,21 +14,21 @@ local git_keymap = {
   { '<leader>gc', group = 'git commit' },
   {
     '<leader>gcU',
-    utils.git_cmd({
+    lazy_git_cmd({
       args = { 'ciu' },
     }),
     desc = 'commit all',
   },
   {
     '<leader>gcS',
-    utils.git_cmd({
+    lazy_git_cmd({
       args = { 'cis' },
     }),
     desc = 'commit staged',
   },
   {
     '<leader>gcf',
-    utils.git_cmd({
+    lazy_git_cmd({
       args = { 'commit', '--no-verify', '-a', '--fixup', 'HEAD' },
     }),
     desc = 'fixup HEAD',
@@ -46,17 +50,17 @@ local git_keymap = {
   },
   {
     '<leader>ghs',
-    utils.git_cmd({ args = { 'stash' } }),
+    lazy_git_cmd({ args = { 'stash' } }),
     desc = 'git stash',
   },
   {
     '<leader>ghp',
-    utils.git_cmd({ args = { 'stash', 'pop' } }),
+    lazy_git_cmd({ args = { 'stash', 'pop' } }),
     desc = 'git stash pop',
   },
   {
     '<leader>gj',
-    utils.git_cmd({
+    lazy_git_cmd({
       args = {
         '-c',
         'sequence.editor=:',
@@ -112,17 +116,17 @@ local git_keymap = {
   },
   {
     '<leader>gpp',
-    utils.git_cmd({ args = { 'pull', '--tags', '--rebase' } }),
+    lazy_git_cmd({ args = { 'pull', '--tags', '--rebase' } }),
     desc = 'git pull',
   },
   {
     '<leader>gpP',
-    utils.git_cmd({ args = { 'push', '-u', '--force-with-lease' } }),
+    lazy_git_cmd({ args = { 'push', '-u', '--force-with-lease' } }),
     desc = 'git push',
   },
   {
     '<leader>gpf',
-    utils.git_cmd({ args = { 'fetch', '--tags', '--all', '--verbose' } }),
+    lazy_git_cmd({ args = { 'fetch', '--tags', '--all', '--verbose' } }),
     desc = 'git fetch',
   },
 }

lua/dcai/keymaps/notes.lua

@@ -10,18 +10,34 @@ local notes_keymap = {
     end,
     desc = 'todo',
   },
-  utils.vim_cmd(
+  {
     '<leader>nb',
-    'NoteGitBranch',
-    'create new note for current git branch'
-  ),
-  utils.vim_cmd('<leader>nc', 'NoteNew', 'create new note'),
-  utils.vim_cmd(
+    function()
+      vim.cmd('NoteGitBranch')
+    end,
+    desc = 'create new note for current git branch',
+  },
+  {
+    '<leader>nc',
+    function()
+      vim.cmd('NoteNew')
+    end,
+    desc = 'create new note',
+  },
+  {
     '<leader>ng',
-    'NoteGit',
-    'create new note for current git repo'
-  ),
-  utils.vim_cmd('<leader>nt', 'NoteToday', 'create new note for today'),
+    function()
+      vim.cmd('NoteGit')
+    end,
+    desc = 'create new note for current git repo',
+  },
+  {
+    '<leader>nt',
+    function()
+      vim.cmd('NoteToday')
+    end,
+    desc = 'create new note for today',
+  },
   {
     '<leader>np',
     function()

lua/dcai/keymaps/testthings.lua

@@ -89,13 +89,55 @@ local testthings_keymap = {
     end,
     desc = 'alternate test file',
   },
-  utils.vim_cmd('<leader>th', 'HurlRun', 'run hurl file'),
-  utils.vim_cmd('<leader>ti', 'VimuxInspectRunner', 'inspect runner'),
-  utils.vim_cmd('<leader>tp', 'VimuxPromptCommand', 'prompt command'),
-  utils.vim_cmd('<leader>tq', 'VimuxCloseRunner', 'close runner'),
-  utils.vim_cmd('<leader>ts', '!%:p', 'run current buffer in shell'),
-  utils.vim_cmd('<leader>tx', 'call VimuxZoomRunner()', 'zoom in'),
-  utils.vim_cmd('<leader>tz', 'call LastPath()', 'open last path in runner'),
+  {
+    '<leader>th',
+    function()
+      vim.cmd('HurlRun')
+    end,
+    desc = 'run hurl file',
+  },
+  {
+    '<leader>ti',
+    function()
+      vim.cmd('VimuxInspectRunner')
+    end,
+    desc = 'inspect runner',
+  },
+  {
+    '<leader>tp',
+    function()
+      vim.cmd('VimuxPromptCommand')
+    end,
+    desc = 'prompt command',
+  },
+  {
+    '<leader>tq',
+    function()
+      vim.cmd('VimuxCloseRunner')
+    end,
+    desc = 'close runner',
+  },
+  {
+    '<leader>ts',
+    function()
+      vim.cmd('!%:p')
+    end,
+    desc = 'run current buffer in shell',
+  },
+  {
+    '<leader>tx',
+    function()
+      vim.cmd('call VimuxZoomRunner()')
+    end,
+    desc = 'zoom in',
+  },
+  {
+    '<leader>tz',
+    function()
+      vim.cmd('call LastPath()')
+    end,
+    desc = 'open last path in runner',
+  },
 }
 
 return testthings_keymap

lua/dcai/keymaps/utils.lua

@@ -57,10 +57,6 @@ end
 
 M.lazy_shell_cmd = lazy_shell_cmd
 
-M.git_cmd = function(opts, desc)
-  return lazy_shell_cmd('git', opts, desc)
-end
-
 M.cmd_with_fidget = function(command, args, opts)
   return function()
     local plenary_loaded, Job = pcall(require, 'plenary.job')
@@ -126,19 +122,6 @@ M.live_grep = function()
   fzf.live_grep({ cwd = vim.g.git_root() })
 end
 
----@param cmd string vim command
-M.vim_cmd = function(key, cmd, desc, notify_after)
-  return {
-    key,
-    function()
-      vim.cmd(cmd)
-      if notify_after then
-        vim.notify(notify_after)
-      end
-    end,
-    desc = desc or cmd,
-  }
-end
 local function open_git_hosting_web()
   -- local mode = vim.fn.mode()
   -- if string.lower(mode) == 'v' then

lua/dcai/keymaps/yankthings.lua

@@ -68,9 +68,13 @@ end
 
 local yank_keymap = {
   { '<leader>y', group = 'yank things' },
-  -- utils.vim_cmd('<leader>yp', 'let @*=expand("%:p")', 'yank file full path'),
-  -- utils.vim_cmd('<leader>yf', 'let @*=expand("%")', 'yank file name'),
-  -- utils.vim_cmd('<leader>ym', 'let @*=execute("messages")', 'yank messages'),
+  {
+    '<leader>yp',
+    function()
+      vim.cmd('let @*=expand("%:p")')
+    end,
+    desc = 'yank file full path',
+  },
   {
     '<leader>yl',
     function()
@@ -98,6 +102,7 @@ local yank_keymap = {
   {
     '<leader>yf',
     function()
+      -- vim.cmd('let @*=expand("%")')
       local filename = vim.fn.expand('%')
       put_content(filename)
     end,
@@ -106,6 +111,7 @@ local yank_keymap = {
   {
     '<leader>ym',
     function()
+      -- vim.cmd('let @*=execute("messages")')
       local messages = vim.fn.execute('messages')
       put_content(vim.split(messages, '\n', { trimempty = true, plain = true }))
     end,