feat: add neogit

lazy-lock.json

@@ -2,84 +2,89 @@
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
   "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
-  "ccc.nvim": { "branch": "main", "commit": "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c" },
+  "ccc.nvim": { "branch": "main", "commit": "f3d9d31aab7990d50ae6922fd7c1e3a9eb7da183" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
   "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" },
   "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" },
-  "cloak.nvim": { "branch": "main", "commit": "951b163e55ce7639eb320c450bde9283c4fe968b" },
+  "cloak.nvim": { "branch": "main", "commit": "9abe4e986e924fc54a972c1b0ff52b65a0622624" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "cd5db8b22de45b52cdac4c3fb6b333f1c02530bf" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "055d7bb37d5c4038ce1e400656b6504602934ce7" },
-  "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
+  "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
   "cmp-dotenv": { "branch": "main", "commit": "fd78929551010bc20602e7e663e42a5e14d76c96" },
-  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" },
   "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" },
   "cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-pypi": { "branch": "main", "commit": "69a3c7eca2d430dabb8d8df5b17f4ce11b256f25" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "codeium.nvim": { "branch": "main", "commit": "cd5913ff5481229b15186293d1d46dd9500789f9" },
   "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
-  "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" },
   "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" },
-  "darkplus.nvim": { "branch": "master", "commit": "2d4a3139a5a6a8f9992954df51f18b48459050dd" },
+  "darkplus.nvim": { "branch": "master", "commit": "8b150ab676d63a4c452aa04990fcef7ae43adcb6" },
-  "dracula.nvim": { "branch": "main", "commit": "a6cb758d4b182d9f2b7e742910078d94877c1059" },
+  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
+  "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" },
+  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
+  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
   "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
+  "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" },
   "hypersonic.nvim": { "branch": "main", "commit": "a98dbd6b5ac1aac3cd895990e08d1ea40e67a9e3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
-  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
+  "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
-  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
+  "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" },
   "markdown.nvim": { "branch": "master", "commit": "c5cb265f8e997476925c165d660678048ec47f38" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
-  "melange-nvim": { "branch": "master", "commit": "258e5afa978aa886e7ac346612e5f920a2b6be59" },
+  "melange-nvim": { "branch": "master", "commit": "ec15b091304580f1d37e711c3a54bc828b09e255" },
-  "neodev.nvim": { "branch": "main", "commit": "345ed5843405126464119154f394d4298c1314c7" },
+  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
-  "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
+  "neogen": { "branch": "main", "commit": "e5460f2ad8de3afaf0864497d2c9c0490b702625" },
-  "neorg": { "branch": "main", "commit": "e6d89d333aff65a771a98955fac9fc178345c01c" },
+  "neogit": { "branch": "master", "commit": "9c5b1392f22203c1ea082ad42f2c97f3ca6b5de1" },
-  "nightfly": { "branch": "master", "commit": "56fe47bd16272d9644fd9946a2596fa2c3905c35" },
+  "neorg": { "branch": "main", "commit": "086891d396ac9fccd91faf1520f563b6eb9eb942" },
-  "nightfox.nvim": { "branch": "main", "commit": "57b8154aba0de8ced36722ea2674a7b97e4f468f" },
+  "nightfly": { "branch": "master", "commit": "e17c27c27372dd3db4aeb9a86d294c506de85ae6" },
-  "none-ls.nvim": { "branch": "main", "commit": "912f81829e9ab4ee3d54c3ea5a304c264f0003bc" },
+  "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" },
-  "nvim": { "branch": "main", "commit": "c2e6f8e7eb8d0ebf55700c89bdf842809aeecf09" },
+  "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" },
-  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
+  "nvim": { "branch": "main", "commit": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" },
+  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
+  "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
-  "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" },
+  "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
-  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" },
-  "nvim-lspconfig": { "branch": "master", "commit": "021906284dcfb938bc236f8295af2650c60cb807" },
+  "nvim-lspconfig": { "branch": "master", "commit": "16295b79410f131c4fa7870c663b4ace6a761fb2" },
-  "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
+  "nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "e9602f41192ba51842b4be4d02c718a64cd57acf" },
+  "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" },
+  "nvim-treesitter": { "branch": "master", "commit": "7ff51f53b0efb6228df2e8539b51bb2e737b77f3" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
+  "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" },
-  "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" },
+  "oil.nvim": { "branch": "master", "commit": "18dfd2458dc741fea683357a17aaa95870b25a3c" },
   "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rainbow_csv": { "branch": "master", "commit": "6955d13a65e0161e8dad488b6045441d527d62ec" },
-  "runner.nvim": { "branch": "main", "commit": "237f7b72c10c34f60c55022d2d79a5f8e5a531a5" },
+  "runner.nvim": { "branch": "main", "commit": "8358ab780793bc2473ad8117ee487f1a468305bf" },
   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" },
-  "telescope-bibtex.nvim": { "branch": "master", "commit": "b10ec78df938a1e06217f965b32fb1b960681cff" },
+  "telescope-bibtex.nvim": { "branch": "master", "commit": "4117b6aad1d1fa7526a31bfcdc9741d11ee4a22c" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" },
   "telescope-heading.nvim": { "branch": "main", "commit": "23ce2c9ef252aecbaa37300c1209b5ef2b51e6c5" },
   "telescope-http.nvim": { "branch": "main", "commit": "b44065749560b3adfdb94bfd751642f0e480af4f" },
-  "telescope-lazy.nvim": { "branch": "main", "commit": "7a360fc33d0728cf0c18c0032ca36ebfe3cd2a8c" },
+  "telescope-lazy.nvim": { "branch": "main", "commit": "3487d6212fe1b5750ae239e2207f4cb603004d36" },
   "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" },
   "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" },
   "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" },
@@ -87,23 +92,23 @@
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
-  "tokyonight.nvim": { "branch": "main", "commit": "e3301873c1e96903daebb98cc9b5926810bf73dd" },
+  "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" },
-  "tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" },
+  "tree-sitter-hyprlang": { "branch": "master", "commit": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b" },
   "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
-  "typst.vim": { "branch": "main", "commit": "816ba15885cb5eb742e06bafcd53b1a8531d334b" },
+  "typst.vim": { "branch": "main", "commit": "ff57d27cf5ee7427941a63fb537714f9a80e0246" },
-  "undotree": { "branch": "master", "commit": "a1758ba9990b7189f601a3a5acdfc8ca3907a700" },
+  "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" },
-  "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
+  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-dadbod": { "branch": "master", "commit": "9d3e3ce74a264642a41e8ae126be5afd095ef107" },
+  "vim-dadbod": { "branch": "master", "commit": "960bbb7de11b7282a68d579a64e838b487934493" },
   "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
   "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" },
-  "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" },
+  "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
-  "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" },
+  "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
   "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" },
   "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" },
-  "vimtex": { "branch": "master", "commit": "32d8541967115eddbb3a38961d51f987d5e28f0d" },
+  "vimtex": { "branch": "master", "commit": "a77d14b2e4391c0d3e860708bb1fd56161ab68eb" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" },
   "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }

lua/plugins/fugitive.lua

@@ -1,36 +0,0 @@
-return {
-	"tpope/vim-fugitive",
-	lazy = false,
-	keys = {
-		{ "<leader>gg", vim.cmd.G, desc = "[G]it" },
-		{ "<leader>gd", vim.cmd.Gdiffsplit, desc = "[G]it [D]iff" },
-		{
-			"<leader>gh",
-			function()
-				vim.cmd.diffget("//2")
-			end,
-			desc = "[G]it Select Left",
-		},
-		{
-			"<leader>gl",
-			function()
-				vim.cmd.diffget("//3")
-			end,
-			desc = "[G]it Select Right",
-		},
-		{
-			"<leader>gp",
-			function()
-				vim.cmd.Git("pull --rebase")
-			end,
-			desc = "[G]it [P]ull",
-		},
-		{
-			"<leader>gP",
-			function()
-				vim.cmd.Git("push -u origin")
-			end,
-			desc = "[G]it [P]ush",
-		},
-	},
-}

lua/plugins/neogit.lua

@@ -0,0 +1,271 @@
+return {
+	"NeogitOrg/neogit",
+	dependencies = {
+		"nvim-lua/plenary.nvim", -- required
+		"sindrets/diffview.nvim", -- optional - Diff integration
+
+		-- Only one of these is needed, not both.
+		"nvim-telescope/telescope.nvim", -- optional
+	},
+	cmd = { "Neogit" },
+	keys = {
+		{
+			"<leader>gg",
+			function()
+				require("neogit").open({ kind = "split" })
+			end,
+			desc = "[G]it",
+		},
+		{ "<leader>gd", vim.cmd.DiffviewOpen, desc = "[G]it [D]iff" },
+	},
+	opts = {
+		-- Hides the hints at the top of the status buffer
+		disable_hint = false,
+		-- Disables changing the buffer highlights based on where the cursor is.
+		disable_context_highlighting = false,
+		-- Disables signs for sections/items/hunks
+		disable_signs = false,
+		-- Changes what mode the Commit Editor starts in. `true` will leave nvim in normal mode, `false` will change nvim to
+		-- insert mode, and `"auto"` will change nvim to insert mode IF the commit message is empty, otherwise leaving it in
+		-- normal mode.
+		disable_insert_on_commit = "auto",
+		-- When enabled, will watch the `.git/` directory for changes and refresh the status buffer in response to filesystem
+		-- events.
+		filewatcher = {
+			interval = 1000,
+			enabled = true,
+		},
+		-- "ascii"   is the graph the git CLI generates
+		-- "unicode" is the graph like https://github.com/rbong/vim-flog
+		graph_style = "ascii",
+		-- Used to generate URL's for branch popup action "pull request".
+		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}",
+		},
+		-- Allows a different telescope sorter. Defaults to 'fuzzy_with_index_bias'. The example below will use the native fzf
+		-- sorter instead. By default, this function returns `nil`.
+		telescope_sorter = function()
+			return require("telescope").extensions.fzf.native_fzf_sorter()
+		end,
+		-- Persist the values of switches/options within and across sessions
+		remember_settings = true,
+		-- Scope persisted settings on a per-project basis
+		use_per_project_settings = true,
+		-- Table of settings to never persist. Uses format "Filetype--cli-value"
+		ignored_settings = {
+			"NeogitPushPopup--force-with-lease",
+			"NeogitPushPopup--force",
+			"NeogitPullPopup--rebase",
+			"NeogitCommitPopup--allow-empty",
+			"NeogitRevertPopup--no-edit",
+		},
+		-- Configure highlight group features
+		highlight = {
+			italic = true,
+			bold = true,
+			underline = true,
+		},
+		-- Set to false if you want to be responsible for creating _ALL_ keymappings
+		use_default_keymaps = true,
+		-- Neogit refreshes its internal state after specific events, which can be expensive depending on the repository size.
+		-- Disabling `auto_refresh` will make it so you have to manually refresh the status after you open it.
+		auto_refresh = true,
+		-- Value used for `--sort` option for `git branch` command
+		-- By default, branches will be sorted by commit date descending
+		-- Flag description: https://git-scm.com/docs/git-branch#Documentation/git-branch.txt---sortltkeygt
+		-- Sorting keys: https://git-scm.com/docs/git-for-each-ref#_options
+		sort_branches = "-committerdate",
+		-- Change the default way of opening neogit
+		kind = "tab",
+		-- Disable line numbers and relative line numbers
+		disable_line_numbers = true,
+		-- The time after which an output console is shown for slow running commands
+		console_timeout = 2000,
+		-- Automatically show console if a command takes more than console_timeout milliseconds
+		auto_show_console = true,
+		status = {
+			recent_commit_count = 10,
+		},
+		commit_editor = {
+			kind = "auto",
+		},
+		commit_select_view = {
+			kind = "tab",
+		},
+		commit_view = {
+			kind = "vsplit",
+			verify_commit = os.execute("which gpg") == 0, -- Can be set to true or false, otherwise we try to find the binary
+		},
+		log_view = {
+			kind = "tab",
+		},
+		rebase_editor = {
+			kind = "auto",
+		},
+		reflog_view = {
+			kind = "tab",
+		},
+		merge_editor = {
+			kind = "auto",
+		},
+		tag_editor = {
+			kind = "auto",
+		},
+		preview_buffer = {
+			kind = "split",
+		},
+		popup = {
+			kind = "split",
+		},
+		signs = {
+			-- { CLOSED, OPENED }
+			hunk = { "", "" },
+			item = { ">", "v" },
+			section = { ">", "v" },
+		},
+		-- Each Integration is auto-detected through plugin presence, however, it can be disabled by setting to `false`
+		integrations = {
+			-- If enabled, use telescope for menu selection rather than vim.ui.select.
+			-- Allows multi-select and some things that vim.ui.select doesn't.
+			telescope = nil,
+			-- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`.
+			-- The diffview integration enables the diff popup.
+			--
+			-- Requires you to have `sindrets/diffview.nvim` installed.
+			diffview = nil,
+
+			-- If enabled, uses fzf-lua for menu selection. If the telescope integration
+			-- is also selected then telescope is used instead
+			-- Requires you to have `ibhagwan/fzf-lua` installed.
+			fzf_lua = nil,
+		},
+		sections = {
+			-- Reverting/Cherry Picking
+			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",
+			},
+			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",
+			},
+			finder = {
+				["<cr>"] = "Select",
+				["<c-c>"] = "Close",
+				["<esc>"] = "Close",
+				["<c-n>"] = "Next",
+				["<c-p>"] = "Previous",
+				["<down>"] = "Next",
+				["<up>"] = "Previous",
+				["<tab>"] = "MultiselectToggleNext",
+				["<s-tab>"] = "MultiselectTogglePrevious",
+				["<c-j>"] = "NOP",
+			},
+			-- Setting any of these to `false` will disable the mapping.
+			popup = {
+				["?"] = "HelpPopup",
+				["A"] = "CherryPickPopup",
+				["D"] = "DiffPopup",
+				["M"] = "RemotePopup",
+				["P"] = "PushPopup",
+				["X"] = "ResetPopup",
+				["Z"] = "StashPopup",
+				["b"] = "BranchPopup",
+				["c"] = "CommitPopup",
+				["f"] = "FetchPopup",
+				["l"] = "LogPopup",
+				["m"] = "MergePopup",
+				["p"] = "PullPopup",
+				["r"] = "RebasePopup",
+				["v"] = "RevertPopup",
+				["w"] = "WorktreePopup",
+			},
+			status = {
+				["q"] = "Close",
+				["I"] = "InitRepo",
+				["1"] = "Depth1",
+				["2"] = "Depth2",
+				["3"] = "Depth3",
+				["4"] = "Depth4",
+				["<tab>"] = "Toggle",
+				["x"] = "Discard",
+				["s"] = "Stage",
+				["S"] = "StageUnstaged",
+				["<c-s>"] = "StageAll",
+				["u"] = "Unstage",
+				["U"] = "UnstageStaged",
+				["$"] = "CommandHistory",
+				["#"] = "Console",
+				["Y"] = "YankSelected",
+				["<c-r>"] = "RefreshBuffer",
+				["<enter>"] = "GoToFile",
+				["<c-v>"] = "VSplitOpen",
+				["<c-x>"] = "SplitOpen",
+				["<c-t>"] = "TabOpen",
+				["{"] = "GoToPreviousHunkHeader",
+				["}"] = "GoToNextHunkHeader",
+			},
+		},
+	},
+}

lua/plugins/telescope.lua

@@ -118,11 +118,11 @@ return {
 			desc = "[G]it Create [N]ew Worktree",
 		},
 		{
-			"<leader>gD",
+			"<leader>pD",
 			function()
 				require("telescope").extensions.git_diffs.diff_commits()
 			end,
-			desc = "[G]it [D]iff",
+			desc = "[G]it [D]iff Telescope",
 		},
 		{
 			"<leader>tB",