diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua index 47d6580..3a5bbc6 100644 --- a/homes/modules/programs/neovim/lua/colors.lua +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -206,11 +206,9 @@ local function load_colors() -- lualine.nvim vim.api.nvim_exec_autocmds("User", { pattern = "RefreshLualine" }) - -- indent-blankline.nvim - vim.api.nvim_set_hl(0, "IblIndent", { fg = secondary_30 }) - vim.api.nvim_set_hl(0, "IblScope", { fg = color_11 }) - vim.api.nvim_exec_autocmds("User", { pattern = "RefreshIndentBlankline" }) - vim.api.nvim_set_hl(0, "@ibl.scope.underline.1", { underline = false }) + -- hlchunk.nvim + vim.api.nvim_set_hl(0, "HLIndent1", { fg = secondary_30 }) + vim.api.nvim_set_hl(0, "HLChunk1", { fg = color_11 }) else print("Error: Not enough colors in file") end @@ -238,9 +236,3 @@ local function watch_colorscheme() end watch_colorscheme() - -vim.api.nvim_create_autocmd("VimLeave", { - callback = function() - io.write("\027]112\007") - end, -}) diff --git a/homes/modules/programs/neovim/lua/plugins/hlchunk.lua b/homes/modules/programs/neovim/lua/plugins/hlchunk.lua new file mode 100644 index 0000000..d4c920d --- /dev/null +++ b/homes/modules/programs/neovim/lua/plugins/hlchunk.lua @@ -0,0 +1,36 @@ +return { + { + "hlchunk.nvim", + enabled = nixCats("ui.hlchunk") or false, + after = function(plugin) + require("hlchunk").setup({ + chunk = { + enable = true, + use_treesitter = true, + chars = { + horizontal_line = "─", + vertical_line = "│", + left_top = "╭", + left_bottom = "╰", + right_arrow = "─", + }, + style = { + "#B0F0FA", + }, + }, + indent = { + enable = true, + use_treesitter = false, + ahead_lines = 10, + delay = 25, + chars = { + "│", + }, + style = { + "#9080FA", + }, + }, + }) + end, + }, +} diff --git a/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua b/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua deleted file mode 100644 index 013fa29..0000000 --- a/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,30 +0,0 @@ -local config = { - debounce = 25, - indent = { - char = "│", - smart_indent_cap = true, - }, - scope = { - show_start = true, - show_end = true, - show_exact_scope = false, - injected_languages = true, - }, -} - -return { - { - "indent-blankline.nvim", - enabled = nixCats("ui.indent-blankline") or false, - after = function(plugin) - require("ibl").setup(config) - - vim.api.nvim_create_autocmd("User", { - pattern = "RefreshIndentBlankline", - callback = function() - require("ibl").setup(config) - end, - }) - end, - }, -} diff --git a/homes/modules/programs/neovim/lua/plugins/init.lua b/homes/modules/programs/neovim/lua/plugins/init.lua index 9bf0602..d23ef30 100644 --- a/homes/modules/programs/neovim/lua/plugins/init.lua +++ b/homes/modules/programs/neovim/lua/plugins/init.lua @@ -8,5 +8,5 @@ require("lze").load({ { import = "plugins.comment" }, { import = "plugins.git" }, { import = "plugins.lualine" }, - { import = "plugins.indent-blankline" }, + { import = "plugins.hlchunk" }, }) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index cb9c8c7..c763b68 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -126,7 +126,7 @@ in { ui = { dressing = [dressing-nvim]; lualine = [lualine-nvim]; - indent-blankline = [indent-blankline-nvim]; + hlchunk = [hlchunk-nvim]; }; qol = [ undotree @@ -241,7 +241,7 @@ in { ui = { dressing = true; lualine = true; - indent-blankline = true; + hlchunk = true; }; qol = true;