Skip to content

v4.0.9 #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeioth merged 2 commits into from
Feb 13, 2025
Merged

v4.0.9 #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece2852
chore(highlight-undo): Upstream has been fixed. Getting updates from …
Zeioth Feb 13, 2025
e03e536
perf(colorscheme): Let's load the colorscheme sync as we used to.
Zeioth Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ local function load_sources_async(source_files)
end
end

local function load_colorscheme_async(colorscheme)
vim.defer_fn(function()
local function load_colorscheme(colorscheme)
if vim.g.default_colorscheme then
if not pcall(vim.cmd.colorscheme, colorscheme) then
require("base.utils").notify(
Expand All @@ -37,7 +36,6 @@ local function load_colorscheme_async(colorscheme)
)
end
end
end, 0)
end

-- Call the functions defined above.
Expand All @@ -46,5 +44,5 @@ load_sources({
"base.2-lazy",
"base.3-autocmds", -- critical stuff, don't change the execution order.
})
load_colorscheme_async(vim.g.default_colorscheme)
load_colorscheme(vim.g.default_colorscheme)
load_sources_async({ "base.4-mappings" })
2 changes: 1 addition & 1 deletion lua/lazy_snapshot.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ return {
{ "stevearc/stickybuf.nvim", commit = "61ec81b9de2a76bfcfaa579f16bf88395b58b814" },
{ "tpope/vim-fugitive", commit = "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" },
{ "tpope/vim-rhubarb", commit = "386daa2e9d98e23e27ad089afcbe5c5a903e488d" },
{ "tzachar/highlight-undo.nvim", commit = "4f6215b0a2b2e88d55a6eb658796ee7a546e73f7" },
{ "williamboman/mason-lspconfig.nvim", version = "^1" },
{ "williamboman/mason.nvim", version = "^1" },
{ "windwp/nvim-autopairs", commit = "3d02855468f94bf435db41b661b58ec4f48a06b7" },
Expand All @@ -102,7 +103,6 @@ return {
{ "zeioth/dooku.nvim", version = "^3" },
{ "zeioth/garbage-day.nvim", version = "^2" },
{ "zeioth/heirline-components.nvim", version = "^1.3" },
{ "zeioth/highlight-undo.nvim", commit = "47e3158419a85f9d2a8bd8cfd5f1ded1edd397f5" },
{ "zeioth/hot-reload.nvim", version = "^1" },
{ "zeioth/markmap.nvim", version = "^3" },
{ "zeioth/mason-extra-cmds", version = "^1" },
Expand Down
7 changes: 3 additions & 4 deletions lua/plugins/2-ui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,16 +673,15 @@ return {
},

-- highlight-undo
-- https://github.com/zeioth/highlight-undo.nvim
-- https://github.com/tzachar/highlight-undo.nvim
-- This plugin only flases on undo/redo.
-- But we also have a autocmd to flash on yank.
{
"zeioth/highlight-undo.nvim",
"tzachar/highlight-undo.nvim",
event = "User BaseDefered",
opts = {
duration = 150,
undo = { hlgroup = 'IncSearch' },
redo = { hlgroup = 'IncSearch' }
hlgroup = "IncSearch",
},
config = function(_, opts)
require("highlight-undo").setup(opts)
Expand Down