Browse Source

trb update

trb
chodylal 1 month ago
parent
commit
8f28515b65
  1. 4
      .config/nvim/lazy-lock.json
  2. 4
      .config/nvim/lazyvim.json
  3. 36
      .config/nvim/lua/plugins/diffview.lua

4
.config/nvim/lazy-lock.json

@ -31,6 +31,7 @@
"nvim-dev-container": { "branch": "main", "commit": "365b4c815339d42133829006dce3e5f8b182b771" },
"nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
"nvim-lspconfig": { "branch": "master", "commit": "d592c1e6ad9a0a01b3d5ed3f0345d68407167181" },
"nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" },
"nvim-treesitter": { "branch": "main", "commit": "bd41519ff7901da11ba6e1c8f419f17f2d94305a" },
"nvim-treesitter-textobjects": { "branch": "main", "commit": "898ee307df58f854d11cd7edd06472574d48014e" },
"nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
@ -42,5 +43,6 @@
"tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
"ts-comments.nvim": { "branch": "main", "commit": "a59d6092213447450191122c9346f309161504cb" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" },
"zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
}

4
.config/nvim/lazyvim.json

@ -1,6 +1,8 @@
{
"extras": [
"lazyvim.plugins.extras.editor.mini-files"
"lazyvim.plugins.extras.editor.mini-files",
"lazyvim.plugins.extras.editor.navic",
"lazyvim.plugins.extras.lang.go"
],
"install_version": 8,
"news": {

36
.config/nvim/lua/plugins/diffview.lua

@ -1 +1,35 @@
return { "sindrets/diffview.nvim" }
return {
"sindrets/diffview.nvim",
cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewFileHistory" },
keys = {
{ "<leader>gvv", "<cmd>DiffviewOpen<cr>", desc = "Diffview Open" },
{ "<leader>gvq", "<cmd>DiffviewClose<cr>", desc = "Diffview Close" },
{ "<leader>gvf", "<cmd>DiffviewFileHistory %<cr>", desc = "Browse current file history" },
{ "<leader>gvr", "<cmd>DiffviewFileHistory<cr>", desc = "Browse repo history" },
{ "<leader>gvh", "<cmd>DiffviewOpen HEAD~1<cr>", desc = "Diff vs last commit" },
{ "<leader>gvm", "<cmd>DiffviewOpen master...HEAD<cr>", desc = "Diff branch vs master" },
},
opts = {
enhanced_diff_hl = true,
view = {
merge_tool = {
layout = "diff3_mixed",
},
},
file_history_panel = {
log_options = {
git = {
all = false,
},
},
win_config = {
position = "bottom",
height = 16,
},
},
file_panel = {
listing_style = "tree",
win_config = { width = 35 },
},
},
}

Loading…
Cancel
Save