From 757b29b026475d502f650aaca62f5bd59662d160 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Sat, 9 Jan 2021 17:21:17 +0530 Subject: [PATCH] nvim: Allow doing commits from within floating terminal With this we can invoke git commit and not have a nested neovim instance. This also makes 'C' option in lazygit to work properly when lazygit is being used from the floating terminal with floaterm. --- nvim/.config/nvim/after/ftplugin/gitcommit.vim | 1 + nvim/.config/nvim/after/ftplugin/gitconfig.vim | 1 + nvim/.config/nvim/after/ftplugin/gitrebase.vim | 2 ++ nvim/.config/nvim/lua/modules/floaterm.lua | 1 + 4 files changed, 5 insertions(+) create mode 100644 nvim/.config/nvim/after/ftplugin/gitconfig.vim diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.vim b/nvim/.config/nvim/after/ftplugin/gitcommit.vim index e2d4e24..6a2130d 100644 --- a/nvim/.config/nvim/after/ftplugin/gitcommit.vim +++ b/nvim/.config/nvim/after/ftplugin/gitcommit.vim @@ -1,6 +1,7 @@ setlocal spell setlocal textwidth=72 setlocal iskeyword+=- +setlocal bufhidden=delete " Jump to sections of diff nmap [c ?^@@ diff --git a/nvim/.config/nvim/after/ftplugin/gitconfig.vim b/nvim/.config/nvim/after/ftplugin/gitconfig.vim new file mode 100644 index 0000000..37a7efd --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/gitconfig.vim @@ -0,0 +1 @@ +setlocal bufhidden=delete diff --git a/nvim/.config/nvim/after/ftplugin/gitrebase.vim b/nvim/.config/nvim/after/ftplugin/gitrebase.vim index 5afa5e8..57ef2a2 100644 --- a/nvim/.config/nvim/after/ftplugin/gitrebase.vim +++ b/nvim/.config/nvim/after/ftplugin/gitrebase.vim @@ -5,3 +5,5 @@ nnoremap e :Edit nnoremap r :Reword nnoremap f :Fixup nnoremap c :Cycle + +setlocal bufhidden=delete diff --git a/nvim/.config/nvim/lua/modules/floaterm.lua b/nvim/.config/nvim/lua/modules/floaterm.lua index f3229de..b54accc 100644 --- a/nvim/.config/nvim/lua/modules/floaterm.lua +++ b/nvim/.config/nvim/lua/modules/floaterm.lua @@ -6,6 +6,7 @@ vim.g.floaterm_width = 0.8 vim.g.floaterm_height = 0.8 vim.g.floaterm_winblend = 0 vim.g.floaterm_borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'} +vim.g.floaterm_gitcommit = 'floaterm' remap('n', '', ':FloatermToggle', { noremap = true, silent = true }) remap('t', '', ':FloatermToggle', { noremap = true, silent = true })