From 3221f41cef8346cf92ba04417ec66768f023e585 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sun, 28 Sep 2025 21:55:30 +0545 Subject: [PATCH] feat(git): enable and configure lazygit.nvim plugin --- lazy-lock.json | 3 +- lua/plugins/git.lua | 123 ++++++++++++++++++++------------------ lua/plugins/languages.lua | 1 + 3 files changed, 66 insertions(+), 61 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 99766ef..c79bae6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,12 +5,12 @@ "better-escape.nvim": { "branch": "master", "commit": "19a38aab94961016430905ebec30d272a01e9742" }, "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "conform.nvim": { "branch": "master", "commit": "3bad87250ed85246fe8c5bc10005ab5a6289ae4c" }, - "floaterm": { "branch": "main", "commit": "34e14f0b5e2687fd31a93fe75982ec84e5145856" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" }, "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -47,7 +47,6 @@ "uv.nvim": { "branch": "main", "commit": "be4a7d47a976249282bb2f71fc773ac2f5325973" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }, - "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" }, "windsurf.vim": { "branch": "main", "commit": "a8d47ec54fe82df920b2545559f767003e8a7f8d" } } diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index 61cb5dd..5494122 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -1,63 +1,68 @@ return { - -- git signs - { - "lewis6991/gitsigns.nvim", - opts = { - signs = { - add = { - text = "+", - }, - change = { - text = "▎", - }, - delete = { - text = "", - }, - topdelete = { - text = "▾", - }, - changedelete = { - text = "~", - }, - untracked = { - text = "┆", - }, - }, - signs_staged = { - add = { - text = "+", - }, - change = { - text = "▎", - }, - delete = { - text = "", - }, - topdelete = { - text = "▾", - }, - changedelete = { - text = "~", - }, - }, - }, - }, + -- git signs + { + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { + text = '+', + }, + change = { + text = '▎', + }, + delete = { + text = '', + }, + topdelete = { + text = '▾', + }, + changedelete = { + text = '~', + }, + untracked = { + text = '┆', + }, + }, + signs_staged = { + add = { + text = '+', + }, + change = { + text = '▎', + }, + delete = { + text = '', + }, + topdelete = { + text = '▾', + }, + changedelete = { + text = '~', + }, + }, + }, + }, - -- lazygit integration - { - "kdheepak/lazygit.nvim", - lazy = true, - enabled = false, - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - keys = { - { "lg", "LazyGit", desc = "LazyGit" }, - }, - }, + -- lazygit integration + { + 'kdheepak/lazygit.nvim', + lazy = true, + enabled = true, + cmd = { + 'LazyGit', + 'LazyGitConfig', + 'LazyGitCurrentFile', + 'LazyGitFilter', + 'LazyGitFilterCurrentFile', + }, + keys = { + { 'lg', 'LazyGit', desc = 'LazyGit' }, + }, + config = function() + vim.g.lazygit_floating_window_winblend = 0 + vim.g.lazygit_floating_window_scaling_factor = 0.9 + vim.g.lazygit_floating_window_border_chars = { '╭', '─', '╮', '│', '╯', '─', '╰', '│' } + end, + }, } diff --git a/lua/plugins/languages.lua b/lua/plugins/languages.lua index facd1a9..09843dd 100644 --- a/lua/plugins/languages.lua +++ b/lua/plugins/languages.lua @@ -129,6 +129,7 @@ return { end, }, + { 'Wansmer/treesj', keys = { 'm', 'j', 's' },