nvim extrasHEADmaster

3 files changed, 91 insertions, 11 deletions

diff --git a/home-configuration/config/nvim/lua/config.lua b/home-configuration/config/nvim/lua/config.lua
index 2100a6c..b405d33 100755
--- a/home-configuration/config/nvim/lua/config.lua
+++ b/home-configuration/config/nvim/lua/config.lua
@@ -32,7 +32,12 @@ vim.g.netrw_liststyle = 3
 
 vim.cmd("let g:netrw_banner = 0")
 
-opt.termguicolors = true
+--toggle colorizer:
+vim.cmd("ColorizerToggle")
+
+--to ensure compat
+--this option was moved to the top of $MYVIMRC (init.lua):
+--opt.termguicolors = true
 
 opt.spell = false
 opt.spelllang = { "en_us" }
@@ -102,4 +107,4 @@ map("n", "<", "<gv", opts)
 map("n", ">", ">gv", opts)
 map("i", "<C-c>", "<ESC>")
 map("n", "<C-c>", ":nohl<CR>", { desc = "Clear search hl", silent = true })
-map("n", "x", "_x", opts)
+--map("n", "x", "_x", opts)
diff --git a/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua b/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua
index 4afee21..6522ecd 100755
--- a/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua
+++ b/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua
@@ -5,6 +5,7 @@ return {
 	"gentoo/gentoo-syntax",
 	"williamboman/mason.nvim",
 	"stevearc/conform.nvim",
+
 	{
 		"neovimhaskell/haskell-vim",
 		ft = "haskell",
@@ -18,31 +19,40 @@ return {
 			vim.g.haskell_indent_if = 2
 		end,
 	},
+
 	{
 		"nvim-telescope/telescope.nvim",
-		--tag = "0.1.5",
 		branch = "master",
-		dependencies = { "nvim-lua/plenary.nvim" },
+		dependencies = {
+			{ "nvim-lua/plenary.nvim", branch = "master" },
+		},
 	},
+
 	{
 		"folke/todo-comments.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
+		dependencies = {
+			{ "nvim-lua/plenary.nvim", branch = "master" },
+		},
 		opts = {},
 	},
+
 	{
 		"nvim-lualine/lualine.nvim",
 		dependencies = { "nvim-tree/nvim-web-devicons" },
 	},
+
 	{
 		"nvimtools/none-ls.nvim",
 		dependencies = {
 			"nvimtools/none-ls-extras.nvim",
 		},
 	},
+
 	{
 		"windwp/nvim-autopairs",
 		event = "InsertEnter",
 	},
+
 	{
 		"hrsh7th/nvim-cmp",
 		dependencies = {
@@ -56,32 +66,41 @@ return {
 			"hrsh7th/vim-vsnip",
 		},
 	},
+
 	{
 		"ray-x/lsp_signature.nvim",
 		event = "VeryLazy",
 	},
+
 	{
 		"nvim-treesitter/nvim-treesitter",
 		lazy = false,
 		priority = 1000,
 		build = ":TSUpdate",
 	},
+
 	"f3fora/cmp-spell",
+
 	{
 		"debugloop/telescope-undo.nvim",
 		dependencies = {
 			{
 				"nvim-telescope/telescope.nvim",
-				dependencies = { "nvim-lua/plenary.nvim" },
+				branch = "master",
+				dependencies = {
+					{ "nvim-lua/plenary.nvim", branch = "master" },
+				},
 			},
 		},
 	},
+
 	{
 		"chomosuke/typst-preview.nvim",
 		lazy = false,
 		version = "1.*",
 		opts = {},
 	},
+
 	{
 		"MeanderingProgrammer/render-markdown.nvim",
 		dependencies = {
@@ -90,8 +109,10 @@ return {
 		},
 		opts = {},
 	},
+
 	"sitiom/nvim-numbertoggle",
 	"mluders/comfy-line-numbers.nvim",
+
 	{
 		"folke/which-key.nvim",
 		event = "VeryLazy",
@@ -100,6 +121,7 @@ return {
 			vim.o.timeoutlen = 300
 		end,
 	},
+
 	{
 		"folke/twilight.nvim",
 		opts = {
@@ -117,13 +139,13 @@ return {
 				"table",
 				"if_statement",
 			},
-			exclude = {
-				"md",
-			},
+			exclude = { "md" },
 		},
 	},
+
 	"nguyenvukhang/nvim-toggler",
 	"alvan/vim-closetag",
+
 	{
 		"numtostr/fterm.nvim",
 		border = "double",
@@ -132,19 +154,28 @@ return {
 			width = 0.9,
 		},
 	},
+
 	{
 		"bluz71/vim-moonfly-colors",
 		name = "moonfly",
 		lazy = false,
 		priority = 1000,
 	},
+
 	{
-		"Fasamii/netrw-icons.nvim",
+		"https://git.coasteen.xyz/netrw-icons.nvim.git",
 		dependencies = {
-			"nvim-tree/nvim-web-devicons", -- or "echasnovski/mini.icons"
+			"nvim-tree/nvim-web-devicons",
 		},
 		config = function()
 			require("netrw-icons").setup()
 		end,
 	},
+
+	{
+		"catgoose/nvim-colorizer.lua",
+		config = function()
+			require("colorizer").setup()
+		end,
+	},
 }
diff --git a/home-configuration/config/nvim/lua/plugins/lazyExtras/init.lua b/home-configuration/config/nvim/lua/plugins/lazyExtras/init.lua
new file mode 100644
index 0000000..3b98c5d
--- /dev/null
+++ b/home-configuration/config/nvim/lua/plugins/lazyExtras/init.lua
@@ -0,0 +1,44 @@
+opts = function()
+	local hi = require("mini.hipatterns")
+	return {
+		-- custom LazyVim option to enable the tailwind integration
+		tailwind = {
+			enabled = true,
+			ft = {
+				"astro",
+				"css",
+				"heex",
+				"html",
+				"html-eex",
+				"javascript",
+				"javascriptreact",
+				"rust",
+				"svelte",
+				"typescript",
+				"typescriptreact",
+				"vue",
+			},
+			-- full: the whole css class will be highlighted
+			-- compact: only the color will be highlighted
+			style = "full",
+		},
+		highlighters = {
+			hex_color = hi.gen_highlighter.hex_color({ priority = 2000 }),
+			shorthand = {
+				pattern = "()#%x%x%x()%f[^%x%w]",
+				group = function(_, _, data)
+					---@type string
+					local match = data.full_match
+					if match == "#add" then
+						return
+					end
+					local r, g, b = match:sub(2, 2), match:sub(3, 3), match:sub(4, 4)
+					local hex_color = "#" .. r .. r .. g .. g .. b .. b
+
+					return MiniHipatterns.compute_hex_color_group(hex_color, "bg")
+				end,
+				extmark_opts = { priority = 2000 },
+			},
+		},
+	}
+end