From c35ca910e4eaa92fdcf9e3e12f936a5baf30f136 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Sat, 15 Jan 2022 11:04:18 +0530 Subject: [PATCH] nvim: plugins: Switch to gitlinker from vim-rhubarb Also see commit a7b12dc6. --- nvim/.config/nvim/after/plugin/fugitive.vim | 3 --- nvim/.config/nvim/after/plugin/gitlinker.lua | 7 +++++++ nvim/.config/nvim/init.lua | 3 +-- nvim/.config/nvim/lua/plugins.lua | 12 ++---------- 4 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 nvim/.config/nvim/after/plugin/gitlinker.lua diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim index 14d1381..d4e809f 100644 --- a/nvim/.config/nvim/after/plugin/fugitive.vim +++ b/nvim/.config/nvim/after/plugin/fugitive.vim @@ -29,9 +29,6 @@ nnoremap g+ :Git stash pop nnoremap gs :Git stash list nnoremap gS :Git stash -- % nnoremap gt :Git reflog -xnoremap gu :GBrowse! -xnoremap gU :GBrowse -nnoremap gu :norm 0v$:GBrowse nnoremap gw :Gwrite nnoremap G :Git diff --git a/nvim/.config/nvim/after/plugin/gitlinker.lua b/nvim/.config/nvim/after/plugin/gitlinker.lua new file mode 100644 index 0000000..0293c14 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/gitlinker.lua @@ -0,0 +1,7 @@ +require"gitlinker".setup({ + callbacks = { + ["gitlab.freedesktop.org"] = require"gitlinker.hosts".get_gitlab_type_url, + ["gitlab.gnome.org/GNOME"] = require"gitlinker.hosts".get_gitlab_type_url, + }, + mappings = "gu" +}) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index dac4596..6bf86a3 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -45,6 +45,7 @@ vim.g.loaded_perl_provider = 0 vim.g.loaded_node_provider = 0 -- Disable some in built plugins completely +vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 vim.g.loaded_matchparen = 1 vim.g.loaded_matchit = 1 @@ -70,8 +71,6 @@ vim.g.vimtex_view_general_options = '--unique \\@pdf\\#src:@tex:@line:@col' vim.g.dirvish_relative_paths = 1 -- dispatch vim.g.dispatch_no_maps = 1 --- vim-fugitive GBrowse GitLab -vim.g.fugitive_gitlab_domains = {'https://gitlab.freedesktop.org', 'https://gitlab.gnome.org/GNOME', 'https://gitlab.com'} -- vim-matchup vim.g.matchup_matchparen_offscreen = {} diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 8b51d31..0cec507 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -24,16 +24,8 @@ local init = function () } -- Git support use 'lewis6991/gitsigns.nvim' - use { - 'tpope/vim-fugitive', - requires = { - -- GBrowse support - 'tpope/vim-rhubarb', - 'shumphrey/fugitive-gitlab.vim', - 'https://git.sr.ht/~willdurand/srht.vim', - 'mattn/webapi-vim' - } - } + use 'tpope/vim-fugitive' + use 'ruifm/gitlinker.nvim' use 'whiteinge/diffconflicts' use 'junkblocker/patchreview-vim' -- Boost vim command line mode