update dotfiles

2026-07-19 19:36:54 +08:00
parent b4010fe910
commit aef001a855
38 changed files with 1680 additions and 826 deletions
@@ -0,0 +1,91 @@
+-- =============================================================================
+-- git.lua — Git 集成
+-- =============================================================================
+-- 【保留】你的 gitsigns + diffview 配置完整保留。
+-- 【新增】✅ lazygit 集成（参考配置有，你缺的）。
+
+return {
+
+  -- gitsigns: 行内 diff 标记
+  {
+    "lewis6991/gitsigns.nvim",
+    event = "BufReadPre",
+    opts = {
+      signs = {
+        add          = { text = "▍" },
+        change       = { text = "▍" },
+        delete       = { text = "▍" },
+        topdelete    = { text = "▍" },
+        changedelete = { text = "▍" },
+      },
+      on_attach = function(bufnr)
+        local gs = require("gitsigns")
+
+        -- 导航
+        vim.keymap.set("n", "]h", function() gs.nav_hunk("next") end, { buffer = bufnr, desc = "下一个修改块" })
+        vim.keymap.set("n", "[h", function() gs.nav_hunk("prev") end, { buffer = bufnr, desc = "上一个修改块" })
+
+        -- Hunk 操作
+        vim.keymap.set("n", "<leader>hs", gs.stage_hunk,   { buffer = bufnr, desc = "暂存修改块" })
+        vim.keymap.set("n", "<leader>hr", gs.reset_hunk,   { buffer = bufnr, desc = "撤销修改块" })
+        vim.keymap.set("n", "<leader>hp", gs.preview_hunk, { buffer = bufnr, desc = "预览修改块" })
+
+        -- 文件操作
+        vim.keymap.set("n", "<leader>hS", gs.stage_buffer,  { buffer = bufnr, desc = "暂存文件" })
+        vim.keymap.set("n", "<leader>hR", gs.reset_buffer,  { buffer = bufnr, desc = "撤销文件修改" })
+
+        -- Blame
+        vim.keymap.set("n", "<leader>hb", gs.blame_line,                { buffer = bufnr, desc = "查看行 blame" })
+        vim.keymap.set("n", "<leader>hl", gs.toggle_current_line_blame, { buffer = bufnr, desc = "切换行 blame" })
+
+        -- 其他
+        vim.keymap.set("n", "<leader>hw", gs.setqflist,        { buffer = bufnr, desc = "列出所有 hunk" })
+        vim.keymap.set("n", "<leader>hd", gs.toggle_word_diff,  { buffer = bufnr, desc = "切换行内 diff" })
+      end,
+    },
+    config = function(_, opts)
+      require("gitsigns").setup(opts)
+      vim.api.nvim_set_hl(0, "GitSignsAdd",    { fg = "#4CAF50" })
+      vim.api.nvim_set_hl(0, "GitSignsChange", { fg = "#2196F3" })
+      vim.api.nvim_set_hl(0, "GitSignsDelete", { fg = "#F44336" })
+    end,
+  },
+
+  -- diffview: Git diff 视图
+  {
+    "sindrets/diffview.nvim",
+    cmd = "DiffviewOpen",
+    keys = {
+      { "<leader>go", "<cmd>DiffviewOpen<cr>",          desc = "查看改动" },
+      { "<leader>gq", "<cmd>DiffviewClose<cr>",         desc = "关闭 diff" },
+      { "<leader>gl", "<cmd>DiffviewFileHistory %<cr>", desc = "文件历史" },
+    },
+    opts = {
+      file_panel = {
+        listing_style = "tree",
+        tree_options = {
+          flatten_dirs = true,
+          folder_statuses = "only_folded",
+        },
+      },
+      keymaps = {
+        view = {
+          { "n", "<leader>q", "<cmd>DiffviewClose<cr>", { desc = "关闭 diffview" } },
+        },
+        file_panel = {
+          { "n", "<leader>q", "<cmd>DiffviewClose<cr>", { desc = "关闭 diffview" } },
+        },
+      },
+    },
+  },
+
+  -- ✅ 新增：lazygit 集成
+  {
+    "kdheepak/lazygit.nvim",
+    cmd = { "LazyGit", "LazyGitCurrentFile" },
+    keys = {
+      { "<leader>gg", ":LazyGit<CR>", desc = "LazyGit" },
+    },
+    dependencies = { "nvim-lua/plenary.nvim" },
+  },
+}