diff --git a/dot_config/nvim/lua/configs/misc.lua b/dot_config/nvim/lua/configs/misc.lua index 8d7385a..e2aa73c 100644 --- a/dot_config/nvim/lua/configs/misc.lua +++ b/dot_config/nvim/lua/configs/misc.lua @@ -31,7 +31,13 @@ function M.setup() -- local buf = args.buf vim.api.nvim_win_set_option(0, 'number', false) vim.api.nvim_win_set_option(0, 'signcolumn', 'no') - vim.schedule(vim.cmd.startinsert) -- without schedule it lock screen refresh + + local winid = vim.api.nvim_get_current_win(); + vim.schedule(function () + if vim.api.nvim_get_current_win() == winid then + vim.cmd.startinsert() + end + end) -- without schedule it lock screen refresh end, }) --}}} diff --git a/dot_config/nvim/lua/configs/options.lua b/dot_config/nvim/lua/configs/options.lua index 2d9e985..6d89a41 100644 --- a/dot_config/nvim/lua/configs/options.lua +++ b/dot_config/nvim/lua/configs/options.lua @@ -67,9 +67,12 @@ function M.setup() vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWinEnter', 'FileType' }, { pattern = '*', callback = function(args) - set_winopts() local buf = args.buf local buftype = vim.bo[buf].buftype + if buftype == 'prompt' then + return -- plugins handle this usually themselves + end + set_winopts() if buftype == 'nofile' or buftype == 'help' then vim.o.list = false vim.bo[buf].buflisted = false @@ -120,7 +123,6 @@ function M.setup() end, }) - if vim.g.neoray then -- {{{ vim.cmd.NeoraySet('CursorAnimTime', 0) vim.cmd.NeoraySet('Transparency', '0.95') diff --git a/dot_config/nvim/lua/configs/packages/gitsigns.lua b/dot_config/nvim/lua/configs/packages/gitsigns.lua index a780e35..7961af3 100644 --- a/dot_config/nvim/lua/configs/packages/gitsigns.lua +++ b/dot_config/nvim/lua/configs/packages/gitsigns.lua @@ -37,6 +37,8 @@ return { map('n', 'gd', gs.diffthis, { desc = 'Gitsigns diff this' }) map('n', 'gD', function() gs.diffthis('~') end, { desc = 'Gitsigns diff this ~' }) map('n', 'gd', gs.toggle_deleted, { desc = 'Gitsigns toggle deleted' }) + map('n', 'ggD', function() vim.ui.input({prompt = 'Branch?'}, function (input) + gs.diffthis(input) end) end, { desc = 'Gitsigns diff this' }) -- Text object map({ 'o', 'x' }, 'ih', ':Gitsigns select_hunk', { desc = 'Inner git hunk' }) diff --git a/dot_config/nvim/lua/configs/packages/misc.lua b/dot_config/nvim/lua/configs/packages/misc.lua index 4842229..3d389c7 100644 --- a/dot_config/nvim/lua/configs/packages/misc.lua +++ b/dot_config/nvim/lua/configs/packages/misc.lua @@ -6,10 +6,23 @@ return { { 'AndrewRadev/linediff.vim', cmd = 'Linediff' }, - { 'lukas-reineke/indent-blankline.nvim', config = true, opts = { - show_current_context = true, - show_current_context_start = false, - }, }, + { 'lukas-reineke/indent-blankline.nvim', + event = 'VeryLazy', + config = true, + opts = { + show_current_context = true, + show_current_context_start = false, + filetype_exclude = { + 'OverseerList', + 'OverseerForm', + 'lspinfo', + 'packer', + 'checkhealth', + 'help', + 'man', + '', + }, + }, }, { 'echasnovski/mini.trailspace', version = '*', config = function() require('mini.trailspace').setup({}) end }, -- stolen from LazyVim