From abfa1bebecaac7eb2fec65309e188f87e124993d Mon Sep 17 00:00:00 2001
From: js0ny <json.y@outlook.com>
Date: Tue, 4 Mar 2025 23:28:51 +0000
Subject: [PATCH] feat(nvim): Use <cmd> instead of :

* This will not let the cursor move when executing commands
---
 tools/nvim/lua/plugins/appearance.lua     |  6 ++--
 tools/nvim/lua/plugins/misc.lua           |  2 +-
 tools/nvim/lua/plugins/mod/alpha-nvim.lua | 12 +++----
 tools/nvim/lua/plugins/mod/bufferline.lua | 32 +++++++++----------
 tools/nvim/lua/plugins/mod/nvim-tree.lua  |  2 +-
 tools/nvim/lua/plugins/mod/telescope.lua  | 38 +++++++++++------------
 6 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/tools/nvim/lua/plugins/appearance.lua b/tools/nvim/lua/plugins/appearance.lua
index 148eee9..2a761dd 100644
--- a/tools/nvim/lua/plugins/appearance.lua
+++ b/tools/nvim/lua/plugins/appearance.lua
@@ -81,9 +81,9 @@ return {
       current_line_blame = true,
     },
     keys = {
-      { "<leader>gb", ":Gitsigns blame<CR>", desc = "Blame file" },
-      { "<leader>gd", ":Gitsigns diffthis<CR>", desc = "Diff file" },
-      { "<leader>gB", ":Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" },
+      { "<leader>gb", "<cmd>Gitsigns blame<CR>", desc = "Blame file" },
+      { "<leader>gd", "<cmd>Gitsigns diffthis<CR>", desc = "Diff file" },
+      { "<leader>gB", "<cmd>Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" },
     },
   },
   { -- Highlight and navigate between TODOs
diff --git a/tools/nvim/lua/plugins/misc.lua b/tools/nvim/lua/plugins/misc.lua
index 65714e5..2e9153c 100644
--- a/tools/nvim/lua/plugins/misc.lua
+++ b/tools/nvim/lua/plugins/misc.lua
@@ -5,7 +5,7 @@ return {
     "CRAG666/code_runner.nvim",
     config = true,
     keys = {
-      { "<leader>cr", ":RunCode<CR>", desc = "Run code" },
+      { "<leader>cr", "<cmd>RunCode<CR>", desc = "Run code" },
     },
     dependencies = {
 
diff --git a/tools/nvim/lua/plugins/mod/alpha-nvim.lua b/tools/nvim/lua/plugins/mod/alpha-nvim.lua
index 738e2ff..c07d395 100644
--- a/tools/nvim/lua/plugins/mod/alpha-nvim.lua
+++ b/tools/nvim/lua/plugins/mod/alpha-nvim.lua
@@ -4,7 +4,7 @@ return {
     "goolord/alpha-nvim",
     dependencies = {},
     keys = {
-      { "<leader>ba", ":Alpha<CR>", desc = "Toggle Alpha Dashboard" },
+      { "<leader>ba", "<cmd>Alpha<CR>", desc = "Toggle Alpha Dashboard" },
     },
     cmd = {
       "Alpha",
@@ -37,12 +37,12 @@ return {
       dashboard.section.buttons.val.leader = "SPC"
       dashboard.section.buttons.val = {
         -- leader = "SPC",
-        dashboard.button("p", "󰈞 查找项目", ":Telescope projects<CR>"),
-        dashboard.button("h", " 历史文件", ":Telescope oldfiles<CR>"),
-        dashboard.button("l", " 加载会话", ":SessionSearch<CR>"),
+        dashboard.button("p", "󰈞 查找项目", "<cmd>Telescope projects<CR>"),
+        dashboard.button("h", " 历史文件", "<cmd>Telescope oldfiles<CR>"),
+        dashboard.button("l", " 加载会话", "<cmd>SessionSearch<CR>"),
         -- FIXME: This does not work on Windows - Make it more portable
-        dashboard.button("c", " 转到设置", ":Telescope find_files cwd=~/.config/nvim<CR>"),
-        dashboard.button("SPC q", "󱊷 退出", ":qa<CR>"),
+        dashboard.button("c", " 转到设置", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>"),
+        dashboard.button("SPC q", "󱊷 退出", "<cmd>qa<CR>"),
       }
       dashboard.section.footer.val = "今日 " .. os.date("%Y-%m-%d %A") .. "  "
 
diff --git a/tools/nvim/lua/plugins/mod/bufferline.lua b/tools/nvim/lua/plugins/mod/bufferline.lua
index e6f5cfc..171898e 100644
--- a/tools/nvim/lua/plugins/mod/bufferline.lua
+++ b/tools/nvim/lua/plugins/mod/bufferline.lua
@@ -12,22 +12,22 @@ return {
   after = "catppuccin",
   lazy = false,
   keys = {
-    { "<leader>b1", ":BufferLineGotoBuffer 1<CR>", desc = "Switch to Buffer #1" },
-    { "<leader>b2", ":BufferLineGotoBuffer 2<CR>", desc = "Switch to Buffer #2" },
-    { "<leader>b3", ":BufferLineGotoBuffer 3<CR>", desc = "Switch to Buffer #3" },
-    { "<leader>b4", ":BufferLineGotoBuffer 4<CR>", desc = "Switch to Buffer #4" },
-    { "<leader>b5", ":BufferLineGotoBuffer 5<CR>", desc = "Switch to Buffer #5" },
-    { "<leader>b6", ":BufferLineGotoBuffer 6<CR>", desc = "Switch to Buffer #6" },
-    { "<leader>b7", ":BufferLineGotoBuffer 7<CR>", desc = "Switch to Buffer #7" },
-    { "<leader>b8", ":BufferLineGotoBuffer 8<CR>", desc = "Switch to Buffer #8" },
-    { "<leader>b9", ":BufferLineGotoBuffer 9<CR>", desc = "Switch to Buffer #9" },
-    { "<leader>bb", ":BufferLinePick<CR>", desc = "Quick Switch Buffers" },
-    { "<leader>bD", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
-    { "<leader>bxx", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
-    { "<leader>bxh", ":BufferLineCloseLeft<CR>", desc = "Delete Buffers Left" },
-    { "<leader>bxi", ":BufferLineCloseRight<CR>", desc = "Delete Buffers Right" },
-    { "<leader>bX", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
-    { "<leader>bt", ":BufferLineTogglePin<CR>", desc = "Pin Buffer" },
+    { "<leader>b1", "<cmd>BufferLineGotoBuffer 1<CR>", desc = "Switch to Buffer #1" },
+    { "<leader>b2", "<cmd>BufferLineGotoBuffer 2<CR>", desc = "Switch to Buffer #2" },
+    { "<leader>b3", "<cmd>BufferLineGotoBuffer 3<CR>", desc = "Switch to Buffer #3" },
+    { "<leader>b4", "<cmd>BufferLineGotoBuffer 4<CR>", desc = "Switch to Buffer #4" },
+    { "<leader>b5", "<cmd>BufferLineGotoBuffer 5<CR>", desc = "Switch to Buffer #5" },
+    { "<leader>b6", "<cmd>BufferLineGotoBuffer 6<CR>", desc = "Switch to Buffer #6" },
+    { "<leader>b7", "<cmd>BufferLineGotoBuffer 7<CR>", desc = "Switch to Buffer #7" },
+    { "<leader>b8", "<cmd>BufferLineGotoBuffer 8<CR>", desc = "Switch to Buffer #8" },
+    { "<leader>b9", "<cmd>BufferLineGotoBuffer 9<CR>", desc = "Switch to Buffer #9" },
+    { "<leader>bb", "<cmd>BufferLinePick<CR>", desc = "Quick Switch Buffers" },
+    { "<leader>bD", "<cmd>BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bxx", "<cmd>BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bxh", "<cmd>BufferLineCloseLeft<CR>", desc = "Delete Buffers Left" },
+    { "<leader>bxi", "<cmd>BufferLineCloseRight<CR>", desc = "Delete Buffers Right" },
+    { "<leader>bX", "<cmd>BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bt", "<cmd>BufferLineTogglePin<CR>", desc = "Pin Buffer" },
   },
   opts = {
     options = {
diff --git a/tools/nvim/lua/plugins/mod/nvim-tree.lua b/tools/nvim/lua/plugins/mod/nvim-tree.lua
index 922984d..7820a47 100644
--- a/tools/nvim/lua/plugins/mod/nvim-tree.lua
+++ b/tools/nvim/lua/plugins/mod/nvim-tree.lua
@@ -24,7 +24,7 @@ return {
   version = "*",
   lazy = false,
   keys = {
-    { "<leader>ft", ":NvimTreeToggle<CR>", desc = "Toggle File Explorer" },
+    { "<leader>ft", "<cmd>NvimTreeToggle<CR>", desc = "Toggle File Explorer" },
   },
   dependencies = {
     "nvim-tree/nvim-web-devicons",
diff --git a/tools/nvim/lua/plugins/mod/telescope.lua b/tools/nvim/lua/plugins/mod/telescope.lua
index c9101f4..34027ca 100644
--- a/tools/nvim/lua/plugins/mod/telescope.lua
+++ b/tools/nvim/lua/plugins/mod/telescope.lua
@@ -28,24 +28,24 @@ return {
   },
   dependencies = { "nvim-lua/plenary.nvim" },
   keys = {
-    { "<leader><leader>", ":Telescope find_files<CR>", desc = "Find Files" },
-    { "<leader>fc", ":Telescope find_files cwd=~/.config/nvim<CR>", desc = "Edit configs" },
-    { "<leader>/", ":Telescope live_grep<CR>", desc = "Grep Files" },
-    { "<leader>;", ":Telescope<CR>", desc = "Show Telescope Commands" },
-    { "<leader>ui", ":Telescope colorscheme<CR>", desc = "Change colorscheme" },
-    { "<leader>pp", ":Telescope projects<CR>", desc = "List all Projects" },
-    { "<leader>pg", ":Telescope projects<CR>", desc = "List all Git Projects" },
-    { "<leader>ps", ":Telescope session-lens<CR>", desc = "List all sessions" },
-    { "<leader>gs", ":Telescope git_status<CR>", desc = "Git Status" },
-    { "<leader>gt", ":Telescope git_branches<CR>", desc = "Git Branches" },
-    { "<leader>gc", ":Telescope git_commits<CR>", desc = "Show commits" },
-    { "<leader>fb", ":Telescope buffers<CR>", desc = "List Buffers" },
-    { "<leader>ff", ":Telescope fd<CR>", desc = "Find Files" },
-    { "<leader>fh", ":Telescope oldfiles<CR>", desc = "Recent Files" },
-    { "<leader>ce", ":Telescope diagnostics<CR>", desc = "Navigate errors/warnings" },
-    { "<leader>cs", ":Telescope treesitter<CR>", desc = "Search symbols" },
-    { "<leader>cS", ":Telescope grep_string<CR>", desc = "Search current symbol" },
-    { "<leader>bB", ":Telescope buffers<CR>", desc = "List Buffers" },
-    { "<leader>fl", ":Telescope filetypes", desc = "Set Filetype/Lang to ..." },
+    { "<leader><leader>", "<cmd>Telescope find_files<CR>", desc = "Find Files" },
+    { "<leader>fc", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>", desc = "Edit configs" },
+    { "<leader>/", "<cmd>Telescope live_grep<CR>", desc = "Grep Files" },
+    { "<leader>;", "<cmd>Telescope<CR>", desc = "Show Telescope Commands" },
+    { "<leader>ui", "<cmd>Telescope colorscheme<CR>", desc = "Change colorscheme" },
+    { "<leader>pp", "<cmd>Telescope projects<CR>", desc = "List all Projects" },
+    { "<leader>pg", "<cmd>Telescope projects<CR>", desc = "List all Git Projects" },
+    { "<leader>ps", "<cmd>Telescope session-lens<CR>", desc = "List all sessions" },
+    { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Git Status" },
+    { "<leader>gt", "<cmd>Telescope git_branches<CR>", desc = "Git Branches" },
+    { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "Show commits" },
+    { "<leader>fb", "<cmd>Telescope buffers<CR>", desc = "List Buffers" },
+    { "<leader>ff", "<cmd>Telescope fd<CR>", desc = "Find Files" },
+    { "<leader>fh", "<cmd>Telescope oldfiles<CR>", desc = "Recent Files" },
+    { "<leader>ce", "<cmd>Telescope diagnostics<CR>", desc = "Navigate errors/warnings" },
+    { "<leader>cs", "<cmd>Telescope treesitter<CR>", desc = "Search symbols" },
+    { "<leader>cS", "<cmd>Telescope grep_string<CR>", desc = "Search current symbol" },
+    { "<leader>bB", "<cmd>Telescope buffers<CR>", desc = "List Buffers" },
+    { "<leader>fl", "<cmd>Telescope filetypes", desc = "Set Filetype/Lang to ..." },
   },
 }