diff --git a/lazy-lock.json b/lazy-lock.json index ba756a1..f546179 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,7 +7,6 @@ "gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" }, "glance.nvim": { "branch": "master", "commit": "cb19b86349cbe634eec0ea768b9a27fdd6d24f34" }, "hurl.nvim": { "branch": "main", "commit": "bf00b4ee56dc8026dd7cd068236fb2c01bb1e307" }, - "key-analyzer.nvim": { "branch": "main", "commit": "72d301fb8843c19d8e69e16e0a0b42256edc25cc" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lspsaga.nvim": { "branch": "main", "commit": "778d56ff9b387dacd14ae648ed5604394b486f51" }, @@ -20,14 +19,15 @@ "none-ls-extras.nvim": { "branch": "main", "commit": "1214d729e3408470a7b7a428415a395e5389c13c" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, + "nvim-autopairs": { "branch": "master", "commit": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968" }, "nvim-lspconfig": { "branch": "master", "commit": "ff6471d4f837354d8257dfa326b031dd8858b16e" }, - "nvim-treesitter": { "branch": "master", "commit": "86768fdd002c75833414010052a1e95a4760ee32" }, + "nvim-treesitter": { "branch": "master", "commit": "9be6836ebeb88a536055bf1ce0961eef68da4bc6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "output-panel.nvim": { "branch": "main", "commit": "9979f9988acb35fd8e699d8b1fbc7aa17c9d8148" }, + "package-info.nvim": { "branch": "master", "commit": "3e8914a77668c780fc5ef8b0fbcf3747dfcf6ec5" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "a1fc4e559252baa128c471adadf0be045abd542d" }, + "render-markdown.nvim": { "branch": "main", "commit": "92256e02db70c474f97fc461b6b6bc4aff7a499a" }, "schemastore.nvim": { "branch": "main", "commit": "e659e0c6ca06727ed898aaaeea3850f528898684" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, diff --git a/lua/plugins/commander.lua b/lua/plugins/commander.lua index cdb8961..3195bc4 100644 --- a/lua/plugins/commander.lua +++ b/lua/plugins/commander.lua @@ -53,17 +53,25 @@ return { desc = "Git branches", }, { - cmd = ":GV", + cmd = function() + require("neogit").action("log", "log_current", { '--graph', '--decorate', '--color' })() + end, desc = "Git log", }, { - cmd = ":Git blame", + cmd = function() + require("gitsigns").blame() + end, desc = "Git blame", }, { cmd = ":DiffviewOpen", desc = "Diff view", }, + { + desc = "Diffview since develop branch", + cmd = ":DiffviewOpen develop..." + }, { cmd = ":UndotreeToggle", desc = "Undotree", @@ -86,18 +94,6 @@ return { keys = { "n", "t" }, set = false, }, - { - cmd = ":GitConflicts", - desc = "Git conflicts to quickfix", - }, - { - cmd = ":LastCommitToQuickfix", - desc = "Last Commit To quickfix", - }, - { - cmd = ":ForkToQuickfix", - desc = "Branch commits to quickfix", - }, { cmd = ":Trouble diagnostics toggle focus=false filter.buf=0", desc = "Diagnostic window (current buffer)", @@ -119,22 +115,9 @@ return { cmd = ":PackageInfoUpdate", desc = "Update package.json dependency", }, - { - cmd = ":CoAuthor", - desc = "Add Git CoAuthor", - }, - { - cmd = ":TailwindConcealToggle", - desc = "Toggle conceal tailwind classes", - }, { cmd = ":OutputPanel", desc = "Toggle LSP Output Panel" - }, - { - cmd = ":KeyAnalyzer", - desc = - "Show diagram of mapped keys under the first parameter key" } }) diff --git a/lua/plugins/key-analyzer.nvim.lua b/lua/plugins/key-analyzer.nvim.lua deleted file mode 100644 index d152603..0000000 --- a/lua/plugins/key-analyzer.nvim.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "meznaric/key-analyzer.nvim", - - opts = {} -} diff --git a/lua/plugins/package-info.nvim.lua b/lua/plugins/package-info.nvim.lua new file mode 100644 index 0000000..ed96fe5 --- /dev/null +++ b/lua/plugins/package-info.nvim.lua @@ -0,0 +1,5 @@ +return { + "vuki656/package-info.nvim", + requires = "MunifTanjim/nui.nvim", + opts = {} +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index caf21ff..ae5caa1 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -83,7 +83,7 @@ return { -- * selection_mode: eg 'v' -- and should return true or false include_surrounding_whitespace = true, - }, + } }, }) end