Skip to content

Commit

Permalink
fix nightly insert issue after telescope insert mode
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Nehrig <[email protected]>
  • Loading branch information
danielnehrig committed Nov 30, 2023
1 parent 05229a3 commit f33fe04
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 53 deletions.
34 changes: 17 additions & 17 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
"LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" },
"alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
"alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" },
"aurora": { "branch": "master", "commit": "6157dffe86f20d891df723c0c6734676295b01e0" },
"barbar.nvim": { "branch": "master", "commit": "283bceab39f549c5e5228212661750704fcfcd9e" },
"better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" },
Expand All @@ -16,12 +16,12 @@
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"commented.nvim": { "branch": "master", "commit": "be322c5ef455800984705cee97490a5450f072bc" },
"copilot.vim": { "branch": "release", "commit": "2c31989063b145830d5f0bea8ab529d2aef2427b" },
"crates.nvim": { "branch": "main", "commit": "406295abeb7eedae3bcee3f0db690ada605c629c" },
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
"crates.nvim": { "branch": "main", "commit": "a8b8f60c33b16c8ef22f8064166daa29a47fca4a" },
"friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
"git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" },
"github-nvim-theme": { "branch": "main", "commit": "24c8706c9ad26b944f5a76dea999dca8708f252e" },
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitsigns.nvim": { "branch": "main", "commit": "5fc573f2d2a49aec74dd6dc977e8b137429d1897" },
"gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
"gruvqueen": { "branch": "master", "commit": "b79ed8b2bcc26e04fb7586f95a1e5d7a600e9cf8" },
"hlargs.nvim": { "branch": "main", "commit": "6218a401824c5733ac50b264991b62d064e85ab2" },
"hlchunk.nvim": { "branch": "main", "commit": "a17b86f7c9640410c168f2421bd3753124d40603" },
Expand All @@ -34,18 +34,18 @@
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f522b5439bedac0225daf8d2fedb5039b59e83ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "41674c9d50f23cfa3e11f0ca964eb9100c2a8922" },
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
"material.nvim": { "branch": "main", "commit": "d61da5decc7768769314c121a3232b6eadc73f2d" },
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
"neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
"neodev.nvim": { "branch": "main", "commit": "f972d7e6cd21b691199565cfe3e6487e774a4e8f" },
"neodev.nvim": { "branch": "main", "commit": "eab4a55c43e0dec631acec992e52490b3f1b5a17" },
"neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
"neogit": { "branch": "master", "commit": "c841473f3700a9561cacfbc7b1451a5d1a0532f6" },
"neogit": { "branch": "master", "commit": "bb538f12fa032c97d4632a6df71d5e0704088139" },
"neotest": { "branch": "master", "commit": "d424d262d01bccc1e0b038c9a7220a755afd2a1f" },
"neotest-jest": { "branch": "main", "commit": "d8b00a91e440474da20a8e9acdb0d72051078b8b" },
"neotest-rust": { "branch": "main", "commit": "46428d9013023f516a61274a78b0cee87fb7e8bc" },
"no-neck-pain.nvim": { "branch": "main", "commit": "c3eb0bdc0e7d9855991412adc6644005e4b1a08a" },
"no-neck-pain.nvim": { "branch": "main", "commit": "0311b1654098b28c29a99007844dfa4bfe315b0a" },
"noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
"nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" },
"nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
Expand All @@ -54,23 +54,23 @@
"nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "0050e236dbebe12de35ecdc646fc1d9a6b0dbb29" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-coverage": { "branch": "main", "commit": "13e357d4a2a230070c64ede61252225f0b7d3b5e" },
"nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" },
"nvim-dap": { "branch": "master", "commit": "13ce59d4852be2bb3cd4967947985cb0ceaff460" },
"nvim-dap-python": { "branch": "master", "commit": "e0be843877e7ae756ef1ee7a441ca0b9e1677da9" },
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
"nvim-jdtls": { "branch": "master", "commit": "44403b2ef6c6285cfd9a3b4fa9a0d746ddae4b45" },
"nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" },
"nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" },
"nvim-lspconfig": { "branch": "master", "commit": "39546f730bdff8eccf7cec344cfce694f19ac908" },
"nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
"nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
"nvim-pqf": { "branch": "main", "commit": "ba0e291cb5c0249838132e197dac082777bdc7d6" },
"nvim-tree.lua": { "branch": "master", "commit": "5e4475d8bf7a3646164e01d9b65ef68369b17e3c" },
"nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" },
"nvim-tree.lua": { "branch": "master", "commit": "05f55c1fd6470b31627655c528245794e3cd4b2c" },
"nvim-treesitter": { "branch": "master", "commit": "8f16c39f5b439bd9540336c4d5da705d180e34b9" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "011c09784f1a95cf469a48c1993b664190440391" },
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "b8ff464f2afc2000f6c72fa331a8fc090cb46b39" },
"nvim-ufo": { "branch": "main", "commit": "c35c447ae65e2879b10d2429489088509d75c329" },
"nvim-web-devicons": { "branch": "master", "commit": "7b1c4a8743e71627beb4e00d0a225247ab6eb2f7" },
"nvim-ufo": { "branch": "main", "commit": "c1e75fb93a5413c73221e23d549cc9f208d592fb" },
"nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
"nvim-yati": { "branch": "main", "commit": "c4307e6855f17ff89f0132787e2daba27495d254" },
"nvimux": { "branch": "master", "commit": "a2cd0cab0acf6c37d999e0cfd199a9fa126a8dcf" },
"one-small-step-for-vimkind": { "branch": "main", "commit": "94b06d81209627d0098c4c5a14714e42a792bf0b" },
Expand All @@ -81,7 +81,7 @@
"plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"preview-swagger.nvim": { "branch": "master", "commit": "b2685918a51478e0c5d4790571e58188aa288512" },
"promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
"promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" },
"refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"satellite.nvim": { "branch": "main", "commit": "7911fa8137c77258ba509ba875ea52c6d59737e8" },
Expand All @@ -95,7 +95,7 @@
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope-project.nvim": { "branch": "master", "commit": "5460c6c60d48618c5c746e5b1cad4c3e8262fdae" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" },
"telescope.nvim": { "branch": "master", "commit": "e4c62dedd760d339bea5b8325c2d918d87476d00" },
"telescope.nvim": { "branch": "master", "commit": "84c5a71d825b6687a55aed6f41e98b92fd8e5454" },
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
"tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
"treesj": { "branch": "main", "commit": "1d6e89f4790aa04eaae38fa9460a3ee191961c96" },
Expand Down
36 changes: 16 additions & 20 deletions lua/config/core/autocmd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,18 @@ function M.autocmds()
end,
group = au_ft,
})
vim.api.nvim_create_autocmd({ "WinEnter", "BufRead", "BufEnter" }, {
pattern = "alpha",
command = "Alpha",
group = au_ft,
})
-- vim.api.nvim_create_autocmd({ "WinEnter", "BufRead", "BufEnter" }, {
-- pattern = "alpha",
-- command = "Alpha",
-- group = au_ft,
-- })
vim.api.nvim_create_autocmd("FileType", {
pattern = "alpha",
command = "set showtabline=0",
group = au_ft,
})
-- lsp
vim.api.nvim_create_augroup("LspAttach_inlayhints", { clear = true })
-- vim.api.nvim_create_autocmd("LspAttach", {
-- group = "LspAttach_inlayhints",
-- callback = function(args)
-- if not (args.data and args.data.client_id) then
-- return
-- end

-- local bufnr = args.buf
-- local client = vim.lsp.get_client_by_id(args.data.client_id)
-- local present, inlay = pcall(require, "lsp-inlayhints")
-- if present then
-- inlay.on_attach(client, bufnr)
-- end
-- end,
-- })
vim.api.nvim_create_autocmd("LspAttach", {
group = "LspAttach_inlayhints",
callback = function(args)
Expand Down Expand Up @@ -140,6 +125,17 @@ function M.autocmds()
-- end
-- end,
-- })
vim.api.nvim_create_autocmd("WinLeave", {
callback = function()
if vim.bo.ft == "TelescopePrompt" and vim.fn.mode() == "i" then
vim.api.nvim_feedkeys(
vim.api.nvim_replace_termcodes("<Esc>", true, false, true),
"i",
false
)
end
end,
})
end

return M
2 changes: 1 addition & 1 deletion lua/config/core/mappings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function M.set_lsp_mapping(bufnr)
{
"<leader>ui",
function()
vim.lsp.inlay_hint(bufnr, nil)
vim.lsp.inlay_hint.enable(bufnr, nil)
end,
{ desc = "Inlay Hint Toggle", buffer = bufnr },
},
Expand Down
2 changes: 1 addition & 1 deletion lua/config/plugins/configs/lspconfig/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function LSP.on_attach(client, bufnr)
require("config.core.mappings").set_lsp_mapping(bufnr)
if vim.version().minor > 9 then
if client.server_capabilities.inlayHintProvider then
vim.lsp.inlay_hint(bufnr, true)
vim.lsp.inlay_hint.enable(bufnr, true)
end
end
end
Expand Down
14 changes: 0 additions & 14 deletions lua/config/plugins/configs/telescope/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,7 @@ function M.init()
vim.notify("telescope is not installed")
return
end
local action_set = require("telescope.actions.set")
telescope.setup({
pickers = {
find_files = {
hidden = true,
attach_mappings = function(_)
action_set.select:enhance({
post = function()
vim.cmd(":normal! zx")
end,
})
return true
end,
},
},
defaults = {
vimgrep_arguments = {
"rg",
Expand Down

0 comments on commit f33fe04

Please sign in to comment.