From 0f90d00e32bc21e7dd790bedde5e5e6ca1f15ba8 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Mon, 20 Feb 2023 17:26:17 -0600 Subject: fix(nvim): remove neogit --- nvim/.config/nvim/lazy-lock.json | 19 ++++---- nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua | 59 ------------------------ 2 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index cccb147..9f5a13a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -26,11 +26,10 @@ "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, "mason-null-ls.nvim": { "branch": "main", "commit": "29ce60f9a16fef3de682a9365ef635f24ae92bf9" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "528920b12fba070df87a36e487ef5b3a480e85b6" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "6b5b5fc42176e0ca1d3634a516cc9b4e5fcc8117" }, "mason-update-all": { "branch": "main", "commit": "d94cf0ff32a5469ca887dd99914bf4b095ebc24f" }, - "mason.nvim": { "branch": "main", "commit": "4546dec8b56bc56bc1d81e717e4a935bc7cd6477" }, + "mason.nvim": { "branch": "main", "commit": "838eedb4dbf59bf9eff6629f733ee71d26d1b31c" }, "neodev.nvim": { "branch": "main", "commit": "a81e749d0fe8429cd340b2e40f274b344bef42ac" }, - "neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" }, "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, "null-ls.nvim": { "branch": "main", "commit": "a82aa08c0063843926947f3688b0e61fd71db680" }, @@ -41,19 +40,19 @@ "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-python": { "branch": "master", "commit": "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, - "nvim-lspconfig": { "branch": "master", "commit": "649137cbc53a044bffde36294ce3160cb18f32c7" }, + "nvim-lspconfig": { "branch": "master", "commit": "f0d9150fe8486d0f74757ed9d8987bfc33c7ff44" }, "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, "nvim-neoclip.lua": { "branch": "main", "commit": "5b9286a40ea2020352280caeb713515badb03d99" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-texlabconfig": { "branch": "master", "commit": "2786bdcc37922c285a560e6f3a1cfad3f09d804c" }, - "nvim-treesitter": { "branch": "master", "commit": "93386fc725041487d6cac90f602a670a83fedcbc" }, + "nvim-treesitter": { "branch": "master", "commit": "ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a" }, "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "2f3583001e2bf793480f38cf0d055571787b0259" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-ts-hint-textobject": { "branch": "master", "commit": "54d6646809d82da0c5d864fb3126ab1961a11f48" }, - "nvim-web-devicons": { "branch": "master", "commit": "53faf5e6d38cb3ca5c7487421524fa2b187b15b2" }, + "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, - "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" }, "ripgrep": { "branch": "master", "commit": "44fb9fce2c1ee1a86c450702ea3ca2952bf6c5a7" }, @@ -63,12 +62,12 @@ "sqlite.lua": { "branch": "master", "commit": "93ff5824682ecc874200e338fd8ca9ccd08508f8" }, "telescope-all-recent.nvim": { "branch": "main", "commit": "f26fad245d5a468fe7fd0b494fc983f707f2c4f3" }, "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "ee594419f3bc39b4123ad0cf8e7d4b7d6cad1303" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "6eb6bb45b7a9bed94a464a3e1dadfe870459628c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" }, - "telescope-symbols.nvim": { "branch": "master", "commit": "f7d7c84873c95c7bd5682783dd66f84170231704" }, + "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" }, "telescope-undo.nvim": { "branch": "main", "commit": "03ff45fab0c4adad4d252e25b5b194e22caf5b4f" }, - "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" }, + "telescope.nvim": { "branch": "master", "commit": "f40e3e2304c633411ddf266075f7db5184b1db02" }, "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" }, "tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" }, "virt-column.nvim": { "branch": "master", "commit": "93b40ea038f676f5a72d7d1f2336fe7b051fc0ce" } diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua deleted file mode 100644 index e01e941..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua +++ /dev/null @@ -1,59 +0,0 @@ ----@diagnostic disable: duplicate-set-field -local M = { - "TimUntersberger/neogit", - opts = { - console_timeout = 20000, - auto_show_console = false, - disable_context_highlighting = true, - disable_commit_confirmation = true, - disable_builtin_notifications = true, - disable_signs = true, - disable_hint = true, - mappings = { - status = { - ["b"] = "", - }, - }, - }, -} - -function M.init() - vim.keymap.set("n", "gg", function() - require("neogit").open() - end, { desc = "neogit" }) - - vim.api.nvim_set_hl(0, "NeogitHunkHeaderHighlight", { link = "Comment" }) - vim.api.nvim_set_hl(0, "NeogitHunkHeader", { link = "Comment" }) - - -- TODO: revert once #415 is merged - -- - -- Refs: https://github.com/TimUntersberger/neogit/pull/415 - vim.api.nvim_create_autocmd("FileType", { - group = vim.api.nvim_create_augroup("neogit_ft_fix", { clear = true }), - pattern = "NeogitCommitMessage", - callback = function() - vim.bo.filetype = "gitcommit" - end, - desc = "Neogit filetype fix", - }) -end - -function M.config(_, opts) - local Buffer = require("neogit.lib.buffer") - - local buffer_show = Buffer.show - function Buffer:show() - self.window = buffer_show(self) - return self.window - end - - local buffer_close = Buffer.close - function Buffer:close(force) - buffer_close(self, force) - pcall(vim.api.nvim_win_close, self.window, force) - end - - require("neogit").setup(opts) -end - -return M -- cgit v1.2.3-70-g09d2