From d687614de9111dcb0595141dc09c69898a9949c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E9=91=AB?= Date: Mon, 17 Mar 2025 10:31:58 +0800 Subject: [PATCH] feat: fugitive --- lazy-lock.json | 11 ++++++----- lua/plugins/editing.lua | 11 ++++++++--- lua/plugins/visuals.lua | 19 ------------------- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 0bec18c..b34fb5c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" }, - "avante.nvim": { "branch": "main", "commit": "931a364dad7b4ff9cc583646c3fd5ae69d3dcc61" }, + "avante.nvim": { "branch": "main", "commit": "110ba8a21fa407e5e01ee55e87015c9cc629ac8e" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,19 +11,19 @@ "csvview.nvim": { "branch": "main", "commit": "ed446a55b4ff9297d9b94a955db3a2eca6cdb2b2" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, + "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, "grug-far.nvim": { "branch": "main", "commit": "0ec6c3a9ef63703975e800d7386b6114863e1f9d" }, "kanagawa.nvim": { "branch": "master", "commit": "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "lualine.nvim": { "branch": "master", "commit": "02d61f515e7d88e1b02366ca972aecf2768d53df" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "16854ed5559b940f69a6f7138906ebb22c15c553" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, - "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, - "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" }, + "nvim-surround": { "branch": "main", "commit": "f70d56275710e202af59148f52100d34b786aecb" }, + "nvim-treesitter": { "branch": "master", "commit": "683816f14718b257666b29f792a8d330936cf5c1" }, "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "render-markdown.nvim": { "branch": "main", "commit": "c065031d030955e1d071a7fcdd8c59e0fd2f0343" }, @@ -33,5 +33,6 @@ "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" }, "ultisnips": { "branch": "master", "commit": "dbc458e110bb49299da76ec53f8b09b4f6dce28a" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua index d8f670c..52bff4d 100644 --- a/lua/plugins/editing.lua +++ b/lua/plugins/editing.lua @@ -51,9 +51,9 @@ return { -- engine = 'ripgrep' is default, but 'astgrep' can be specified }); - vim.keymap.set("n", "g", function() + vim.keymap.set("n", "gf", function() vim.cmd [[GrugFar]] - end, { desc = "Run GrugFar" }) + end, { desc = "GrugFar" }) end }, { "folke/flash.nvim", @@ -135,7 +135,6 @@ return { "yetone/avante.nvim", event = 'VeryLazy', lazy = false, - build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false", dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", @@ -236,5 +235,11 @@ return { }, } end + }, { + 'tpope/vim-fugitive', + config = function() + vim.keymap.set('n', 'gs', ':Git', {desc = "Git Status"}) + vim.keymap.set('n', 'gd', ':Git diff', {desc = "Git Diff"}) + end } } diff --git a/lua/plugins/visuals.lua b/lua/plugins/visuals.lua index 3193e09..00cc9b9 100644 --- a/lua/plugins/visuals.lua +++ b/lua/plugins/visuals.lua @@ -85,24 +85,5 @@ return { ---@module 'render-markdown' ---@type render.md.UserConfig opts = {}, - },{ - 'akinsho/toggleterm.nvim', - config = function() - local Terminal = require('toggleterm.terminal').Terminal - local lazygit = nil - - function _lazygit_toggle() - if lazygit == nil then - lazygit = Terminal:new({ - cmd = "lazygit", - hidden = true, - direction = 'float', - }) - end - lazygit:toggle() - end - - vim.api.nvim_set_keymap("n", "lg", "lua _lazygit_toggle()", {noremap = true, silent = true}) - end } }