testfugitive

init.lua

@@ -16,6 +16,7 @@ vim.opt.rtp:prepend(lazypath)
 
 local lazy_config = require "configs.lazy"
 
+
 -- load plugins
 require("lazy").setup({
     {

lazy-lock.json

@@ -1,8 +1,8 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "1b375c24602680b5fe28c3c223a822111857dc37" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
   "NvChad": { "branch": "v2.5", "commit": "6f25b2739684389ca69ea8229386c098c566c408" },
-  "auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" },
+  "auto-session": { "branch": "main", "commit": "41ac59e5f400b3f4f9b11e478ccf6e077de5f6c7" },
   "base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
   "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -12,33 +12,38 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "command-completion.nvim": { "branch": "main", "commit": "56c98f8d59a88ed96a80d43abca74a60ba31ea3a" },
-  "conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" },
+  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
   "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" },
   "focus.nvim": { "branch": "master", "commit": "d76338e58e49f844e8f6a7aff16a74a2a55a80ef" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2ff0c29f2a6b1247d96cc59535d53e5589fb50b6" },
+  "fzf-lua": { "branch": "main", "commit": "aaf7604bca38890cb487b29738f8cb02586bc818" },
+  "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
+  "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "7769b17c2a131108c02b10e9f844e504aa605cc2" },
+  "mini.pick": { "branch": "main", "commit": "100f283e65b44cca47763bf38f1d0f90b4116646" },
   "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" },
+  "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" },
   "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
-  "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
+  "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
-  "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
+  "nvim-dap": { "branch": "master", "commit": "b4f27d451c187de912fa8d3229025a952917eb9e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d1871c84b218931cc758dbbde1fec8e90c6d465c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" },
-  "nvim-tree.lua": { "branch": "master", "commit": "fca0b67c0b5a31727fb33addc4d9c100736a2894" },
+  "nvim-tree.lua": { "branch": "master", "commit": "d05881f65f0a653db8d830ccc4d2e07d6a720628" },
-  "nvim-treesitter": { "branch": "master", "commit": "07bd1b53bf465e42d53253b48b7437892d6c45e8" },
+  "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" },
   "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "cf0da2516b0684596b09c51dbc93c609cdc2f455" },
   "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
-  "ui": { "branch": "v3.0", "commit": "196c1e75b239bb2e57c065fc0a0daa7fdc1e3bcb" },
+  "ui": { "branch": "v3.0", "commit": "e196e36b088e12b7082e2665a58be15f7d709460" },
   "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
+  "vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" },
   "vim-suda": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
-  "volt": { "branch": "main", "commit": "91fe3e82842a709443cdd61fc1a1315a5eb57a8d" },
+  "volt": { "branch": "main", "commit": "3bedb1576db574af160643eea7df3b09dbe5ee9c" },
-  "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
+  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
 }

lua/configs/neogit.lua

@@ -0,0 +1,285 @@
+require("neogit").setup {
+    disable_hint = false,
+    disable_context_highlighting = false,
+    disable_signs = false,
+    disable_insert_on_commit = "auto",
+    filewatcher = {
+        interval = 1000,
+        enabled = true,
+    },
+    graph_style = "ascii",
+    commit_date_format = nil,
+    log_date_format = nil,
+    process_spinner = false,
+    git_services = {
+        ["github.com"] = "https://github.com/${owner}/${repository}/compare/${branch_name}?expand=1",
+        ["bitbucket.org"] = "https://bitbucket.org/${owner}/${repository}/pull-requests/new?source=${branch_name}&t=1",
+        ["gitlab.com"] = "https://gitlab.com/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}",
+        ["azure.com"] = "https://dev.azure.com/${owner}/_git/${repository}/pullrequestcreate?sourceRef=${branch_name}&targetRef=${target}",
+    },
+    telescope_sorter = function()
+        return require("telescope").extensions.fzf.native_fzf_sorter()
+    end,
+    remember_settings = true,
+    use_per_project_settings = true,
+    ignored_settings = {
+        "NeogitPushPopup--force-with-lease",
+        "NeogitPushPopup--force",
+        "NeogitPullPopup--rebase",
+        "NeogitCommitPopup--allow-empty",
+        "NeogitRevertPopup--no-edit",
+    },
+    highlight = {
+        italic = true,
+        bold = true,
+        underline = true
+    },
+    use_default_keymaps = true,
+    auto_refresh = true,
+    sort_branches = "-committerdate",
+    initial_branch_name = "",
+    kind = "tab",
+    disable_line_numbers = true,
+    disable_relative_line_numbers = true,
+    console_timeout = 2000,
+    auto_show_console = true,
+    auto_close_console = true,
+    notification_icon = "󰊢",
+    status = {
+        show_head_commit_hash = true,
+        recent_commit_count = 10,
+        HEAD_padding = 10,
+        HEAD_folded = false,
+        mode_padding = 3,
+        mode_text = {
+            M = "modified",
+            N = "new file",
+            A = "added",
+            D = "deleted",
+            C = "copied",
+            U = "updated",
+            R = "renamed",
+            DD = "unmerged",
+            AU = "unmerged",
+            UD = "unmerged",
+            UA = "unmerged",
+            DU = "unmerged",
+            AA = "unmerged",
+            UU = "unmerged",
+            ["?"] = "",
+        },
+    },
+    commit_editor = {
+        kind = "tab",
+        show_staged_diff = true,
+        staged_diff_split_kind = "split",
+        spell_check = true,
+    },
+    commit_select_view = {
+        kind = "tab",
+    },
+    commit_view = {
+        kind = "vsplit",
+        verify_commit = vim.fn.executable("gpg") == 1,
+    },
+    log_view = {
+        kind = "tab",
+    },
+    rebase_editor = {
+        kind = "auto",
+    },
+    reflog_view = {
+        kind = "tab",
+    },
+    merge_editor = {
+        kind = "auto",
+    },
+    description_editor = {
+        kind = "auto",
+    },
+    tag_editor = {
+        kind = "auto",
+    },
+    preview_buffer = {
+        kind = "floating_console",
+    },
+    popup = {
+        kind = "split",
+    },
+    stash = {
+        kind = "tab",
+    },
+    refs_view = {
+        kind = "tab",
+    },
+    signs = {
+        hunk = { "", "" },
+        item = { ">", "v" },
+        section = { ">", "v" },
+    },
+    integrations = {
+        telescope = nil,
+        diffview = nil,
+        fzf_lua = nil,
+        mini_pick = nil,
+    },
+    sections = {
+        sequencer = {
+            folded = false,
+            hidden = false,
+        },
+        untracked = {
+            folded = false,
+            hidden = false,
+        },
+        unstaged = {
+            folded = false,
+            hidden = false,
+        },
+        staged = {
+            folded = false,
+            hidden = false,
+        },
+        stashes = {
+            folded = true,
+            hidden = false,
+        },
+        unpulled_upstream = {
+            folded = true,
+            hidden = false,
+        },
+        unmerged_upstream = {
+            folded = false,
+            hidden = false,
+        },
+        unpulled_pushRemote = {
+            folded = true,
+            hidden = false,
+        },
+        unmerged_pushRemote = {
+            folded = false,
+            hidden = false,
+        },
+        recent = {
+            folded = true,
+            hidden = false,
+        },
+        rebase = {
+            folded = true,
+            hidden = false,
+        },
+    },
+    mappings = {
+        commit_editor = {
+            ["q"] = "Close",
+            ["<c-c><c-c>"] = "Submit",
+            ["<c-c><c-k>"] = "Abort",
+            ["<m-p>"] = "PrevMessage",
+            ["<m-n>"] = "NextMessage",
+            ["<m-r>"] = "ResetMessage",
+        },
+        commit_editor_I = {
+            ["<c-c><c-c>"] = "Submit",
+            ["<c-c><c-k>"] = "Abort",
+        },
+        rebase_editor = {
+            ["p"] = "Pick",
+            ["r"] = "Reword",
+            ["e"] = "Edit",
+            ["s"] = "Squash",
+            ["f"] = "Fixup",
+            ["x"] = "Execute",
+            ["d"] = "Drop",
+            ["b"] = "Break",
+            ["q"] = "Close",
+            ["<cr>"] = "OpenCommit",
+            ["gk"] = "MoveUp",
+            ["gj"] = "MoveDown",
+            ["<c-c><c-c>"] = "Submit",
+            ["<c-c><c-k>"] = "Abort",
+            ["[c"] = "OpenOrScrollUp",
+            ["]c"] = "OpenOrScrollDown",
+        },
+        rebase_editor_I = {
+            ["<c-c><c-c>"] = "Submit",
+            ["<c-c><c-k>"] = "Abort",
+        },
+        finder = {
+            ["<cr>"] = "Select",
+            ["<c-c>"] = "Close",
+            ["<esc>"] = "Close",
+            ["<c-n>"] = "Next",
+            ["<c-p>"] = "Previous",
+            ["<down>"] = "Next",
+            ["<up>"] = "Previous",
+            ["<tab>"] = "InsertCompletion",
+            ["<space>"] = "MultiselectToggleNext",
+            ["<s-space>"] = "MultiselectTogglePrevious",
+            ["<c-j>"] = "NOP",
+            ["<ScrollWheelDown>"] = "ScrollWheelDown",
+            ["<ScrollWheelUp>"] = "ScrollWheelUp",
+            ["<ScrollWheelLeft>"] = "NOP",
+            ["<ScrollWheelRight>"] = "NOP",
+            ["<LeftMouse>"] = "MouseClick",
+            ["<2-LeftMouse>"] = "NOP",
+        },
+        popup = {
+            ["?"] = "HelpPopup",
+            ["A"] = "CherryPickPopup",
+            ["d"] = "DiffPopup",
+            ["M"] = "RemotePopup",
+            ["P"] = "PushPopup",
+            ["X"] = "ResetPopup",
+            ["Z"] = "StashPopup",
+            ["i"] = "IgnorePopup",
+            ["t"] = "TagPopup",
+            ["b"] = "BranchPopup",
+            ["B"] = "BisectPopup",
+            ["w"] = "WorktreePopup",
+            ["c"] = "CommitPopup",
+            ["f"] = "FetchPopup",
+            ["l"] = "LogPopup",
+            ["m"] = "MergePopup",
+            ["p"] = "PullPopup",
+            ["r"] = "RebasePopup",
+            ["v"] = "RevertPopup",
+        },
+        status = {
+            ["j"] = "MoveDown",
+            ["k"] = "MoveUp",
+            ["o"] = "OpenTree",
+            ["q"] = "Close",
+            ["I"] = "InitRepo",
+            ["1"] = "Depth1",
+            ["2"] = "Depth2",
+            ["3"] = "Depth3",
+            ["4"] = "Depth4",
+            ["Q"] = "Command",
+            ["<tab>"] = "Toggle",
+            ["x"] = "Discard",
+            ["s"] = "Stage",
+            ["S"] = "StageUnstaged",
+            ["<c-s>"] = "StageAll",
+            ["u"] = "Unstage",
+            ["K"] = "Untrack",
+            ["U"] = "UnstageStaged",
+            ["y"] = "ShowRefs",
+            ["$"] = "CommandHistory",
+            ["Y"] = "YankSelected",
+            ["<c-r>"] = "RefreshBuffer",
+            ["<cr>"] = "GoToFile",
+            ["<s-cr>"] = "PeekFile",
+            ["<c-v>"] = "VSplitOpen",
+            ["<c-x>"] = "SplitOpen",
+            ["<c-t>"] = "TabOpen",
+            ["{"] = "GoToPreviousHunkHeader",
+            ["}"] = "GoToNextHunkHeader",
+            ["[c"] = "OpenOrScrollUp",
+            ["]c"] = "OpenOrScrollDown",
+            ["<c-k>"] = "PeekUp",
+            ["<c-j>"] = "PeekDown",
+            ["<c-n>"] = "NextSection",
+            ["<c-p>"] = "PreviousSection",
+        },
+    },
+}

lua/plugins/init.lua

@@ -7,6 +7,26 @@ return {
 
     { "hiphish/rainbow-delimiters.nvim" },
 
+    {
+        "NeogitOrg/neogit",
+        dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+
+            -- Only one of these is needed.
+            "nvim-telescope/telescope.nvim", -- optional
+            "ibhagwan/fzf-lua",              -- optional
+            "echasnovski/mini.pick",         -- optional
+        },
+        config = function()
+            require "configs.neogit"
+        end,
+    },
+
+    {
+        "tpope/vim-fugitive",
+    },
+
     {
         "mbbill/undotree",
     },