fresh

2023-12-30 21:19:06 +05:45
commit 0cbbf662e3
@@ -0,0 +1,44 @@
+return {
+  {
+    "sindrets/diffview.nvim",
+    keys = {
+      { "<leader>gd", "<cmd>DiffviewFileHistory<CR>", desc = "Diff File History" },
+      { "<leader>gD", "<cmd>DiffviewOpen<CR>", desc = "Diff View Open" },
+    },
+    opts = function(_, opts)
+      local actions = require("diffview.actions")
+
+      opts.keymaps = {
+        --stylua: ignore
+        view = {
+          { "n", "<leader>gCo",  actions.conflict_choose("ours"),        { desc = "Choose the OURS version of a conflict" } },
+          { "n", "<leader>gCt",  actions.conflict_choose("theirs"),      { desc = "Choose the THEIRS version of a conflict" } },
+          { "n", "<leader>gCb",  actions.conflict_choose("base"),        { desc = "Choose the BASE version of a conflict" } },
+          { "n", "<leader>gCa",  actions.conflict_choose("all"),         { desc = "Choose all the versions of a conflict" } },
+          { "n", "<leader>gCx",          actions.conflict_choose("none"),        { desc = "Delete the conflict region" } },
+          { "n", "<leader>gCO",  actions.conflict_choose_all("ours"),    { desc = "Choose the OURS version of a conflict for the whole file" } },
+          { "n", "<leader>gCT",  actions.conflict_choose_all("theirs"),  { desc = "Choose the THEIRS version of a conflict for the whole file" } },
+          { "n", "<leader>gCB",  actions.conflict_choose_all("base"),    { desc = "Choose the BASE version of a conflict for the whole file" } },
+          { "n", "<leader>gCA",  actions.conflict_choose_all("all"),     { desc = "Choose all the versions of a conflict for the whole file" } },
+          { "n", "<leader>gCX",          actions.conflict_choose_all("none"),    { desc = "Delete the conflict region for the whole file" } },
+        },
+        --stylua: ignore
+        file_panel = {
+          { "n", "<leader>gCO",     actions.conflict_choose_all("ours"),    { desc = "Choose the OURS version of a conflict for the whole file" } },
+          { "n", "<leader>gCT",     actions.conflict_choose_all("theirs"),  { desc = "Choose the THEIRS version of a conflict for the whole file" } },
+          { "n", "<leader>gCB",     actions.conflict_choose_all("base"),    { desc = "Choose the BASE version of a conflict for the whole file" } },
+          { "n", "<leader>gCA",     actions.conflict_choose_all("all"),     { desc = "Choose all the versions of a conflict for the whole file" } },
+          { "n", "<leader>gCX",             actions.conflict_choose_all("none"),    { desc = "Delete the conflict region for the whole file" } },
+        },
+      }
+    end,
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>gC"] = { name = "conflicts" },
+      },
+    },
+  },
+}
@@ -0,0 +1,26 @@
+return {
+  {
+    "akinsho/git-conflict.nvim",
+    opts = {
+      default_mappings = false,
+    },
+    version = "v1.0.0",
+    cmd = { "GitConflictChooseTheirs", "GitConflictChooseOurs", "GitConflictChooseBoth", "GitConflictListQf" },
+    keys = {
+      { "<leader>gCt", "<cmd>GitConflictChooseTheirs<cr>", desc = "Choose Their Changes" },
+      { "<leader>gCo", "<cmd>GitConflictChooseOurs<cr>", desc = "Choose Our Changes" },
+      { "<leader>gCb", "<cmd>GitConflictChooseBoth<cr>", desc = "Choose Both changes" },
+      { "<leader>gCl", "<cmd>GitConflictListQf<cr>", desc = "Git Conflict Quicklist" },
+      { "[g", "<cmd>GitConflictPrevConflict<cr>", desc = "Prev Git Conflict" },
+      { "]g", "<cmd>GitConflictPrevConflict<cr>", desc = "Next Git Conflict" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>gC"] = { name = "conflicts" },
+      },
+    },
+  },
+}
@@ -0,0 +1,103 @@
+local prefix = "<leader>G"
+
+return {
+  {
+    "almo7aya/openingh.nvim",
+    cmd = { "OpenInGHRepo", "OpenInGHFile", "OpenInGHFileLines" },
+    keys = {
+      { prefix .. "ro", "<cmd>OpenInGHRepo<CR>", desc = "Open git repo in web", mode = { "n" } },
+      { prefix .. "rf", "<cmd>OpenInGHFile<CR>", desc = "Open git file in web", mode = { "n" } },
+      { prefix .. "rc", "<cmd>OpenInGHFileLines<CR>", desc = "Open current line in web", mode = { "n", "x", "v" } },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>G"] = { name = " github" },
+        ["<leader>Gc"] = { name = "comments" },
+        ["<leader>Gt"] = { name = "threads" },
+        ["<leader>Gi"] = { name = "issues" },
+        ["<leader>Gp"] = { name = "pull requests" },
+        ["<leader>Gpm"] = { name = "merge current PR" },
+        ["<leader>Gr"] = { name = "repo" },
+        ["<leader>Ga"] = { name = "assignee/reviewer" },
+        ["<leader>Gl"] = { name = "label" },
+        ["<leader>Ge"] = { name = "reaction" },
+        ["<leader>GR"] = { name = "review" },
+      },
+    },
+  },
+  {
+    "pwntester/octo.nvim",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-telescope/telescope.nvim",
+      "nvim-tree/nvim-web-devicons",
+    },
+    cmd = { "Octo" },
+    opts = {
+      use_diagnostic_signs = true,
+      mappings = {},
+    },
+    keys = {
+      { prefix .. "ca", "<cmd>Octo comment add<CR>", desc = "Add a new comment" },
+      { prefix .. "cd", "<cmd>Octo comment delete<CR>", desc = "Delete a comment" },
+
+      { prefix .. "ta", "<cmd>Octo thread resolve<CR>", desc = "Mark thread as resolved" },
+      { prefix .. "td", "<cmd>Octo thread unresolve<CR>", desc = "Mark thread as unresolved" },
+
+      { prefix .. "ic", "<cmd>Octo issue close<CR>", desc = "Close current issue" },
+      { prefix .. "ir", "<cmd>Octo issue reopen<CR>", desc = "Reopen current issue" },
+      { prefix .. "il", "<cmd>Octo issue list<CR>", desc = "List open issues" },
+      { prefix .. "iu", "<cmd>Octo issue url<CR>", desc = "Copies URL of current issue" },
+      { prefix .. "io", "<cmd>Octo issue browser<CR>", desc = "Open current issue in browser" },
+
+      { prefix .. "pp", "<cmd>Octo pr checkout<CR>", desc = "Checkout PR" },
+      { prefix .. "pmm", "<cmd>Octo pr merge commit<CR>", desc = "Merge commit PR" },
+      { prefix .. "pms", "<cmd>Octo pr merge squash<CR>", desc = "Squash merge PR" },
+      { prefix .. "pmd", "<cmd>Octo pr merge delete<CR>", desc = "Delete merge PR" },
+      { prefix .. "pmr", "<cmd>Octo pr merge rebase<CR>", desc = "Rebase merge PR" },
+      { prefix .. "pc", "<cmd>Octo pr close<CR>", desc = "Close current PR" },
+      { prefix .. "pn", "<cmd>Octo pr create<CR>", desc = "Create PR for current branch" },
+      { prefix .. "pd", "<cmd>Octo pr diff<CR>", desc = "Show PR diff" },
+      { prefix .. "ps", "<cmd>Octo pr list<CR>", desc = "List open PRs" },
+      { prefix .. "pr", "<cmd>Octo pr ready<CR>", desc = "Mark draft as ready for review" },
+      { prefix .. "po", "<cmd>Octo pr browser<CR>", desc = "Open current PR in browser" },
+      { prefix .. "pu", "<cmd>Octo pr url<CR>", desc = "Copies URL of current PR" },
+      { prefix .. "pt", "<cmd>Octo pr commits<CR>", desc = "List PR commits" },
+      { prefix .. "pl", "<cmd>Octo pr commits<CR>", desc = "List changed files in PR" },
+
+      { prefix .. "rl", "<cmd>Octo repo list<CR>", desc = "List repo user stats" },
+      { prefix .. "rF", "<cmd>Octo repo fork<CR>", desc = "Fork repo" },
+      { prefix .. "ru", "<cmd>Octo repo url<CR>", desc = "Copies URL of current repo" },
+
+      { prefix .. "aa", "<cmd> Octo assignee add<CR>", desc = "Assign a user" },
+      { prefix .. "ar", "<cmd> Octo assignee remove<CR>", desc = "Remove a user" },
+      { prefix .. "ap", "<cmd> Octo reviewer add<CR>", desc = "Assign a PR reviewer" },
+
+      { prefix .. "la", "<cmd> Octo label add<CR>", desc = "Assign a label" },
+      { prefix .. "lr", "<cmd> Octo label remove<CR>", desc = "Remove a label" },
+      { prefix .. "lc", "<cmd> Octo label create<CR>", desc = "Create a label" },
+
+      { prefix .. "e1", "<cmd>Octo reaction thumbs_up<CR>", desc = "Add 👍 reaction" },
+      { prefix .. "e2", "<cmd>Octo reaction thumbs_down<CR>", desc = "Add 👎 reaction" },
+      { prefix .. "e3", "<cmd>Octo reaction eyes<CR>", desc = "Add 👀 reaction" },
+      { prefix .. "e4", "<cmd>Octo reaction laugh<CR>", desc = "Add 😄 reaction" },
+      { prefix .. "e5", "<cmd>Octo reaction confused<CR>", desc = "Add 😕 reaction" },
+      { prefix .. "e6", "<cmd>Octo reaction rocket<CR>", desc = "Add 🚀 reaction" },
+      { prefix .. "e7", "<cmd>Octo reaction heart<CR>", desc = "Add ❤️ reaction" },
+      { prefix .. "e8", "<cmd>Octo reaction party<CR>", desc = "Add 🎉 reaction" },
+
+      { prefix .. "x", "<cmd>Octo actions<CR>", desc = "Run an action" },
+
+      { prefix .. "ss", "<cmd> Octo review start<CR>", desc = "Start review" },
+      { prefix .. "sf", "<cmd> Octo review submit<CR>", desc = "Submit review" },
+      { prefix .. "sr", "<cmd> Octo review resume<CR>", desc = "Submit resume" },
+      { prefix .. "sd", "<cmd> Octo review discard<CR>", desc = "Delete pending review" },
+      { prefix .. "sc", "<cmd> Octo review comments<CR>", desc = "View pending comments" },
+      { prefix .. "sp", "<cmd> Octo review commit<CR>", desc = "Select commit to review" },
+      { prefix .. "sc", "<cmd> Octo review close<CR>", desc = "Return to PR" },
+    },
+  },
+}
@@ -0,0 +1,24 @@
+return {
+  {
+    "ThePrimeagen/git-worktree.nvim",
+    opts = {},
+    config = function()
+      require("lazyvim.util").on_load("telescope.nvim", function()
+        require("telescope").load_extension("git_worktree")
+      end)
+    end,
+    -- stylua: ignore
+    keys = {
+      { "<leader>gwm", function() require("telescope").extensions.git_worktree.git_worktrees() end, desc = "Manage Worktrees" },
+      { "<leader>gwc", function() require("telescope").extensions.git_worktree.create_git_worktree() end, desc = "Create Worktree" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>gw"] = { name = "worktrees" },
+      },
+    },
+  },
+}