Merge develop into master

lazy-lock.json

@@ -1,38 +1,40 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" },
-  "github-preview.nvim": { "branch": "main", "commit": "dd7b9d5efb4f7a4c11ff41f4af078ad739b21fb8" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
-  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
-  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
-  "lspsaga.nvim": { "branch": "main", "commit": "b1b140aa20a0cf353cd3e282870429b48b30a169" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "material": { "branch": "main", "commit": "1804e517ceb0fce958a9fabaa94c9a6e09d54b8f" },
-  "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
-  "none-ls.nvim": { "branch": "main", "commit": "bb680d752cec37949faca7a1f509e2fe67ab418a" },
-  "nvim-autopairs": { "branch": "master", "commit": "90f824d37c0cb079d2764927e73af77faa9ba0ef" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" },
-  "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
-  "nvim-treesitter": { "branch": "master", "commit": "19bf991be2403c10fa379fa0fb11b7de2560ac31" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" },
-  "obsidian.nvim": { "branch": "main", "commit": "59d274bec753b0a60a994d3dce14a43d91790b57" },
-  "oil.nvim": { "branch": "master", "commit": "6953c2c17d8ae7454b28c44c8767eebede312e6f" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
-  "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" },
-  "vim-markdown-toc": { "branch": "master", "commit": "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd" },
-  "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" },
-  "vim-table-mode": { "branch": "master", "commit": "4ff8de2ac93431ee6d85a9e04177012752e6abdc" }
+  "conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" },
+  "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
+  "github-preview.nvim": { "branch": "main", "commit": "b1f286a0c2c5bfcc0fea467decbb73e657428065" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" },
+  "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
+  "material": { "branch": "main", "commit": "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4" },
+  "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" },
+  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" },
+  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
+  "nvim-treesitter": { "branch": "master", "commit": "4ee5fdd666f46fb379302a32750f932d25448d98" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "obsidian.nvim": { "branch": "main", "commit": "f0bc495b4a3852a83b48636e9f564586f5e2d29e" },
+  "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" },
+  "typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" },
+  "vim-markdown-toc": { "branch": "master", "commit": "05d6538ccef1d33f2d26f2515c0eacaa93d2e061" },
+  "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" },
+  "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }
 }

lua/autocmd/markdown_codeblock.lua

@@ -20,19 +20,19 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'BufRead', 'BufWinEnter', 'TextChanged
 				end
 
 				if in_code_block then
-					vim.api.nvim_buf_add_highlight(bufnr, namespace, 'MarkdownCodeBlock', i - 1, 0, -1)
+					vim.api.nvim_buf_add_highlight(bufnr, namespace, 'CustomMarkdownCodeBlock', i - 1, 0, -1)
 					local fill_width = math.max(0, win_width)
 					local fill_text = string.rep(' ', fill_width)
 
 					vim.api.nvim_buf_set_extmark(bufnr, namespace, i - 1, #line, {
-						virt_text = { { fill_text, 'MarkdownCodeBlock' } },
+						virt_text = { { fill_text, 'CustomMarkdownCodeBlock' } },
 						virt_text_pos = 'overlay',
 						hl_mode = 'combine',
 					})
 				end
 
 				::continue::
 			end
-		end, 10) -- 10 ms delay, adjust as needed
+		end, 50) -- 50ms delay, adjust as needed
 	end,
 })

lua/autocmd/markdown_rules.lua

@@ -52,6 +52,10 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'BufRead', 'BufWinEnter', 'TextChanged
 						underline_char = '·'
 						local unicode_line = string.rep(underline_char, win_width)
 						set_markdown_extmark(i, unicode_line, 'CustomMarkdownHeadingUnderline3')
+					elseif line:match('^####%s') then
+						underline_char = '─'
+						local unicode_line = string.rep(underline_char, win_width)
+						set_markdown_extmark(i, unicode_line, 'CustomMarkdownHeadingUnderline3')
 					end
 
 					-- Quote conceal logic

lua/keymaps.lua

@@ -53,6 +53,14 @@ keymap.set('n', '<leader>EE', '<cmd>e!<CR>', noremap) -- save
 -- search and
 keymap.set('n', '<leader>RR', ':%s/<c-r><c-w>/<c-r><c-w>', noremap) -- Search and replace the word under current
 keymap.set('n', '<leader>rr', ':let @/ = "\\\\<" . expand(\'<cword>\') . "\\\\>"<CR>:set hlsearch<CR>cgn', noremap) -- Search for the word under the cursor. cgn is removed for versatile usage.
+
+-- keymap.set(
+-- 	'n',
+-- 	'<leader>rr',
+-- 	':let @/ = substitute(expand("<cword>"), "\\\\<\\\\>", "", "g")<CR>:set hlsearch<CR>cgn',
+-- 	noremap
+-- ) -- Search for the word under the cursor. cgn is removed for versatile usage.
+
 keymap.set('n', '<leader>ll', '<s-v>/\\%V', noremap) -- Search the pattern/word within the highlighted line
 keymap.set('n', 'n', 'nzz', noremap) -- center search result
 keymap.set('n', 'N', 'Nzz', noremap) -- center search result

lua/lazy.lua

@@ -28,5 +28,6 @@ require('lazy').setup('plugins', {
 	},
 	ui = {
 		border = 'rounded',
+		backdrop = 100, -- The backdrop opacity. 0 is fully opaque, 100 is fully transparent.
 	},
 })

lua/plugins/colorscheme/extends/lualine/component_colors/catppuccin.lua

@@ -2,7 +2,7 @@ return function(colors)
 	return {
 		lazy = { fg = colors.yellow },
 		search_count = { fg = colors.yellow },
-		path_winbar = { fg = colors.crest },
+		path_winbar = { fg = colors.surface2, bg = '' },
 		diff_color = {
 			added = { fg = colors.green },
 			modified = { fg = colors.yellow },

lua/plugins/colorscheme/extends/lualine/component_colors/material.lua

@@ -2,7 +2,7 @@ return function(colors)
 	return {
 		lazy = { fg = colors.main.yellow },
 		search_count = { fg = colors.main.orange },
-		path_winbar = { fg = colors.editor.fg_dark, bg = '' },
+		path_winbar = { fg = colors.editor.disabled, bg = '' },
 		branch = { fg = colors.main.gray },
 		diff_color = {
 			added = { fg = colors.main.green },

lua/plugins/colorscheme/extends/lualine/custom_theme/catppuccin.lua

@@ -1,44 +1,44 @@
 return function(colors)
 	return {
 		normal = {
-			a = { fg = colors.blue, bg = colors.crust },
-			b = { fg = colors.overlay, bg = colors.crust },
-			c = { fg = colors.overlay, bg = colors.crust },
-			x = { fg = colors.overlay, bg = colors.crust },
-			y = { fg = colors.overlay, bg = colors.crust },
-			z = { fg = colors.green, bg = colors.crust },
+			a = { fg = colors.blue, bg = colors.base },
+			b = { fg = colors.overlay, bg = colors.base },
+			c = { fg = colors.overlay, bg = colors.base },
+			x = { fg = colors.overlay, bg = colors.base },
+			y = { fg = colors.overlay, bg = colors.base },
+			z = { fg = colors.green, bg = colors.base },
 		},
 		insert = {
-			a = { fg = colors.rosewater, bg = colors.crust },
-			b = { fg = colors.rosewater, bg = colors.crust },
-			c = { fg = colors.rosewater, bg = colors.crust },
-			x = { fg = colors.rosewater, bg = colors.crust },
-			y = { fg = colors.rosewater, bg = colors.crust },
-			z = { fg = colors.rosewater, bg = colors.crust },
+			a = { fg = colors.rosewater, bg = colors.base },
+			b = { fg = colors.rosewater, bg = colors.base },
+			c = { fg = colors.rosewater, bg = colors.base },
+			x = { fg = colors.rosewater, bg = colors.base },
+			y = { fg = colors.rosewater, bg = colors.base },
+			z = { fg = colors.rosewater, bg = colors.base },
 		},
 		visual = {
-			a = { fg = colors.lavender, bg = colors.crust },
-			b = { fg = colors.lavender, bg = colors.crust },
-			c = { fg = colors.lavender, bg = colors.crust },
-			x = { fg = colors.lavender, bg = colors.crust },
-			y = { fg = colors.lavender, bg = colors.crust },
-			z = { fg = colors.lavender, bg = colors.crust },
+			a = { fg = colors.lavender, bg = colors.base },
+			b = { fg = colors.lavender, bg = colors.base },
+			c = { fg = colors.lavender, bg = colors.base },
+			x = { fg = colors.lavender, bg = colors.base },
+			y = { fg = colors.lavender, bg = colors.base },
+			z = { fg = colors.lavender, bg = colors.base },
 		},
 		command = {
-			a = { fg = colors.yellow, bg = colors.crust },
-			b = { fg = colors.yellow, bg = colors.crust },
-			c = { fg = colors.yellow, bg = colors.crust },
-			x = { fg = colors.yellow, bg = colors.crust },
-			y = { fg = colors.yellow, bg = colors.crust },
-			z = { fg = colors.yellow, bg = colors.crust },
+			a = { fg = colors.yellow, bg = colors.base },
+			b = { fg = colors.yellow, bg = colors.base },
+			c = { fg = colors.yellow, bg = colors.base },
+			x = { fg = colors.yellow, bg = colors.base },
+			y = { fg = colors.yellow, bg = colors.base },
+			z = { fg = colors.yellow, bg = colors.base },
 		},
 		inactive = {
-			a = { fg = colors.overlay, bg = colors.crust },
-			b = { fg = colors.overlay, bg = colors.crust },
-			c = { fg = colors.overlay, bg = colors.crust },
-			x = { fg = colors.overlay, bg = colors.crust },
-			y = { fg = colors.overlay, bg = colors.crust },
-			z = { fg = colors.overlay, bg = colors.crust },
+			a = { fg = colors.overlay, bg = colors.base },
+			b = { fg = colors.overlay, bg = colors.base },
+			c = { fg = colors.overlay, bg = colors.base },
+			x = { fg = colors.overlay, bg = colors.base },
+			y = { fg = colors.overlay, bg = colors.base },
+			z = { fg = colors.overlay, bg = colors.base },
 		},
 	}
 end

lua/plugins/colorscheme/init.lua

@@ -1,119 +1,3 @@
--- https://github.com/marko-cerovac/material.nvim
--- https://github.com/marko-cerovac/material.nvim/blob/main/lua/material/colors/init.lua
+local colorscheme = require('plugins.colorscheme.presets.material')
 
-vim.g.material_style = 'deep ocean' -- darker | lighter | oceanic | palenight | deep ocean
-
-return {
-	'marko-cerovac/material.nvim',
-	lazy = false,
-	priority = 1000,
-	name = 'material',
-	config = function()
-		local material = require('material')
-		local colors = require('material.colors')
-		local custom_color = {
-			selection = '#292e42',
-			search = '#394b70',
-		}
-
-		require('material').setup({
-			contrast = {
-				terminal = false, -- Enable contrast for the built-in terminal
-				sidebars = false, -- Enable contrast for sidebar-like windows ( for example Nvim-Tree )
-				floating_windows = false, -- Enable contrast for floating windows
-				cursor_line = false, -- Enable darker background for the cursor line
-				non_current_windows = false, -- Enable contrasted background for non-current windows
-				filetypes = {}, -- Specify which filetypes get the contrasted (darker) background
-			},
-
-			plugins = { -- Uncomment the plugins that you use to highlight them
-				-- Available plugins:
-				'gitsigns',
-				'harpoon',
-				'indent-blankline',
-				'lspsaga',
-				'nvim-cmp',
-				'nvim-web-devicons',
-			},
-
-			disable = {
-				colored_cursor = false, -- Disable the colored cursor
-				borders = false, -- Disable borders between vertically split windows
-				background = true, -- Prevent the theme from setting the background (NeoVim then uses your terminal background)
-				term_colors = false, -- Prevent the theme from setting terminal colors
-				eob_lines = false, -- Hide the end-of-buffer lines
-			},
-
-			high_visibility = {
-				lighter = false, -- Enable higher contrast text for lighter style
-				darker = false, -- Enable higher contrast text for darker style
-			},
-
-			lualine_style = 'default', -- Lualine style ( can be 'stealth' or 'default' )
-
-			async_loading = true, -- Load parts of the theme asynchronously for faster startup (turned on by default)
-
-			custom_highlights = {
-				IncSearch = { fg = colors.main.blue, bg = custom_color.search, underline = false },
-				CurSearch = { fg = colors.main.blue, bg = custom_color.search, underline = false },
-				CursorLine = { bg = custom_color.selection },
-				Search = { fg = '', bg = '', underline = false },
-				TelescopeSelection = { fg = '', bg = custom_color.selection },
-				TelescopeBorder = { fg = colors.main.paleblue, bg = '' },
-				CursorLineNr = { fg = '' },
-				TabLineFill = { bg = '' },
-				WinSeparator = { fg = colors.main.paleblue },
-				CmpItemAbbrMatch = { fg = colors.main.orange, bg = '' },
-				CmpItemAbbrMatchFuzzy = { fg = colors.main.orange, bg = '' },
-				FloatBorder = { fg = colors.main.paleblue },
-				MatchParen = { fg = colors.main.yellow, bg = colors.editor.selection, bold = false },
-				MarkdownCodeBlock = { bg = colors.editor.selection },
-				CustomMarkdownHeadingUnderline1 = { fg = colors.editor.comment },
-				CustomMarkdownHeadingUnderline2 = { fg = colors.editor.comment },
-				CustomMarkdownHeadingUnderline3 = { fg = colors.editor.line_numbers },
-				CustomMarkdownHorizontalRule = { fg = colors.editor.comments },
-				MarkdownBold = { fg = colors.editor.fg_dark, bold = true },
-				CodeActionNumber = { fg = colors.main.cyan, bg = '' },
-				['@markup.heading.1.marker.markdown'] = { fg = colors.main.red, bold = true },
-				['@markup.heading.1.markdown'] = { fg = colors.main.red, bold = true },
-				['@markup.heading.2.marker.markdown'] = { fg = colors.main.orange, bold = true },
-				['@markup.heading.2.markdown'] = { fg = colors.main.orange, bold = true },
-				['@markup.heading.3.marker.markdown'] = { fg = colors.main.yellow, bold = true },
-				['@markup.heading.3.markdown'] = { fg = colors.main.yellow, bold = true },
-				['@markup.heading.4.marker.markdown'] = { fg = colors.main.green, bold = true },
-				['@markup.heading.4.markdown'] = { fg = colors.main.green, bold = true },
-				['@markup.heading.5.marker.markdown'] = { fg = colors.main.cyan, bold = true },
-				['@markup.heading.5.markdown'] = { fg = colors.main.cyan, bold = true },
-				['@markup.heading.6.marker.markdown'] = { fg = colors.main.blue, bold = true },
-				['@markup.heading.6.markdown'] = { fg = colors.main.blue, bold = true },
-				['@markup.raw.markdown_inline'] = { fg = '', bg = custom_color.search, bold = true },
-				['@punctuation.special.markdown'] = { fg = colors.main.blue },
-
-				-- - @markup.raw.block.markdown links to @markup markdown
-				-- - @none.markdown links to @none markdown
-				-- - @comment.bash links to Comment bash
-				-- - @spell.bash links to @spell bash
-				-- This is a list of possible values
-				-- YourHighlightGroup = {
-				--     fg = "#SOME_COLOR", -- foreground color
-				--     bg = "#SOME_COLOR", -- background color
-				--     sp = "#SOME_COLOR", -- special color (for colored underlines, undercurls...)
-				--     bold = false, -- make group bold
-				--     italic = false, -- make group italic
-				--     underline = false, -- make group underlined
-				--     undercurl = false, -- make group undercurled
-				--     underdot = false, -- make group underdotted
-				--     underdash = false, -- make group underslashed
-				--     striketrough = false, -- make group striked through
-				--     reverse = false, -- reverse the fg and bg colors
-				--     link = "SomeOtherGroup" -- link to some other highlight group
-				-- }
-			}, -- Overwrite highlights with your own
-			custom_colors = function(colors) -- If you want to override the default colors, set this to a function
-				colors.editor.selection = custom_color.selection
-			end,
-		})
-
-		vim.cmd('colorscheme material')
-	end,
-}
+return colorscheme