refactor toggleterm config

Author: nshen

lua/keybindings.lua

@@ -258,22 +258,6 @@ pluginKeys.mapVimspector = function()
   map("n", "<leader>dl", "<Plug>VimspectorStepInto", opt)
 end
 
--- 自定义 toggleterm 3个不同类型的命令行窗口
--- <leader>ta 浮动
--- <leader>tb 右侧
--- <leader>tc 下方
--- 特殊lazygit 窗口，需要安装lazygit
--- <leader>tg lazygit
-pluginKeys.mapToggleTerm = function(toggleterm)
-  vim.keymap.set({ "n", "t" }, "<leader>ta", toggleterm.toggleA)
-  vim.keymap.set({ "n", "t" }, "<leader>tj", function()
-    toggleterm.toggleA("pnpm test")
-  end)
-  vim.keymap.set({ "n", "t" }, "<leader>tb", toggleterm.toggleB)
-  vim.keymap.set({ "n", "t" }, "<leader>tc", toggleterm.toggleC)
-  vim.keymap.set({ "n", "t" }, "<leader>tg", toggleterm.toggleG)
-end
-
 -- gitsigns
 pluginKeys.gitsigns_on_attach = function(bufnr)
   local gs = package.loaded.gitsigns

lua/plugin-config/toggleterm.lua

@@ -1,4 +1,10 @@
----@diagnostic disable: missing-parameter
+local uConfig = require("uConfig")
+local uToggleTerm = uConfig.toggleterm
+
+if uToggleTerm == nil or not uToggleTerm.enable then
+  return
+end
+
 local status, toggleterm = pcall(require, "toggleterm")
 if not status then
   vim.notify("没有找到 toggleterm")
@@ -98,4 +104,13 @@ M.toggleG = function()
   lazygit:toggle()
 end
 
-require("keybindings").mapToggleTerm(M)
+vim.keymap.set({ "n", "t" }, uToggleTerm.toggle_window_A, M.toggleA)
+vim.keymap.set({ "n", "t" }, uToggleTerm.toggle_window_B, M.toggleB)
+vim.keymap.set({ "n", "t" }, uToggleTerm.toggle_window_C, M.toggleC)
+
+--[[ 
+vim.keymap.set({ "n", "t" }, "<leader>tj", function()
+  M.toggleA("pnpm test")
+end)
+vim.keymap.set({ "n", "t" }, "<leader>tg", M.toggleG)
+]]

lua/uConfig.lua

@@ -79,12 +79,6 @@ local M = {
 
     -- proxy
     -- im-select
-    -- plugins
-
-    -- nvimTree = {
-    --   enable = true,
-    --
-    -- },
   },
 
   enable_magic_search = true,
@@ -189,6 +183,17 @@ local M = {
     },
   },
 
+  toggleterm = {
+    enable = true,
+
+    -- <leader>ta 浮动命令行窗口
+    toggle_window_A = "<leader>ta",
+    -- <leader>tb 右侧命令行窗口
+    toggle_window_B = "<leader>tb",
+    -- <leader>tc 下方命令行窗口
+    toggle_window_C = "<leader>tc",
+  },
+
   venn = {
     -- toggle keymappings for venn using <leader>v
     enable = true,