touching the nvim.

nvim/lua/config/plugins/bufferline.lua

@@ -1,36 +1,46 @@
 local icons = require('config.icons')
 
-return function ()
-	local highlightfunc = require("catppuccin.groups.integrations.bufferline")
-	return {
-		highlights = highlightfunc.get(),
-		options = {
-			mode = "buffers",
-			themable = true,
-			buffer_close_icon = icons.close,
-			close_icon = icons.close,
-			modified_icon = icons.modified_icon,
-			diagnostics = false,
-			enforce_regular_tabs = true,
-			indicator = {
-				style = 'underline',
-			},
-			close_command = function (bufnum)
-				vim.cmd("bprev")
-				vim.api.nvim_buf_delete(bufnum, {})
-			end,
-			hover = {
+return function()
+    local highlightfunc = require("catppuccin.groups.integrations.bufferline")
+    return {
+        highlights = highlightfunc.get(),
+        options = {
+            mode = "buffers",
+            themable = true,
+            buffer_close_icon = icons.close,
+            close_icon = icons.close,
+            modified_icon = icons.modified,
+            diagnostics = false,
+            enforce_regular_tabs = true,
+            indicator = {
+                icon = "",
+            },
+            close_command = function(bufnum)
+                vim.cmd("bprev")
+                vim.api.nvim_buf_delete(bufnum, {})
+            end,
+            hover = {
                 enabled = true,
                 delay = 200,
-                reveal = {'close'}
+                reveal = { 'close' }
             },
-			offsets = {
-				{
-					filetype = "neo-tree",
-					text = "File Explorer",
-					text_align = "left"
-				}
-			},
-		}
-	}
+            offsets = {
+                {
+                    filetype = "neo-tree",
+                    text = "File Explorer",
+                    text_align = "left"
+                }
+            },
+            custom_areas = {
+                left = function()
+                    return {
+                        {
+                            text = "    ",
+                            fg = "#8fff6d",
+                        }
+                    }
+                end
+            }
+        }
+    }
 end

nvim/lua/config/plugins/catppuccin.lua

@@ -2,7 +2,7 @@ return {
 	flavour = "mocha",
 	color_overrides = {
 		mocha = {
-			base = '#0e1019',
+			base = '#0E1019',
 			mantle = '#0D0F17',
 			crust = '#0C0D14',
 			surface0 = '#131521',
@@ -19,13 +19,17 @@ return {
 	highlight_overrides = {
 		mocha = function(colors)
 			return {
+                -- Normal = { fg = colors.text },
+                -- NormalNC = { fg = colors.text },
+
 				-- Floating windows
-				NormalFloat = { fg = colors.text, bg = colors.base },
+				NormalFloat = { fg = colors.text, bg = colors.mantle },
 				FloatTitle = { fg = colors.base, bg = colors.blue },
-				FloatBorder = { fg = colors.blue, bg = colors.base },
+				FloatBorder = { fg = colors.blue, bg = colors.mantle },
 
 				-- Window separator
 				WinSeparator = { fg = colors.surface0 },
+				NeoTreeWinSeparator = { link = "WinSeparator" },
 
 				-- Menus
 				Pmenu = { fg = colors.text, bg = colors.mantle },
@@ -49,6 +53,16 @@ return {
 				TelescopePromptBorder = { fg = colors.mantle, bg = colors.mantle },
 				TelescopePromptTitle = { fg = colors.crust, bg = colors.blue },
 				TelescopePreviewTitle = { fg = colors.crust, bg = colors.mauve },
+				TelescopeSelection = { fg = colors.text, bg = colors.surface0 },
+
+				-- Statusline
+                StatusLine = { fg = colors.text, bg = colors.mantle },
+                StatusLineNormal = { fg = colors.text, bg = colors.mantle },
+                StatusLineSeparator = { fg = colors.surface0, bg = colors.mantle },
+				StatusLineInsert = { fg = colors.base, bg = colors.blue },
+				StatusLineVisual = { fg = colors.base, bg = colors.mauve },
+				StatusLineCommand = { fg = colors.base, bg = colors.yellow },
+                StatusLineReplace = { fg = colors.base, bg = colors.maroon },
 
 				-- Syntax
 				PreProc = { link = "Include" },

nvim/lua/config/plugins/cmp.lua

@@ -1,81 +1,59 @@
-local icons = require('config.icons')
+return function()
+    local cmp = require('cmp')
+    local lspkind = require('utils.lspkind')
+    local icons = require('config.icons')
 
-return function ()
-	local lspkind_config = {
-		mode = 'symbol',
-		preset = 'codicons',
-		symbol_map = icons.symbols,
-		maxwidth = 40,
-		ellipsis_char = "...",
-	}
-	local cmp = require('cmp')
+    local selectPrev = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert })
+    local selectNext = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert })
 
-	local selectPrev = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert })
-	local selectNext = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert })
+    local borderstyle = {
+        border = "none",
+        winhighlight = 'Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None',
+    }
 
-	local borderstyle = {
-		border = "none",
-		winhighlight = 'Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None',
-	}
-
-	return {
-		completion = {
-			completeopt = "menu,menuone,noinsert",
-		},
-		-- enabled = function()
-		-- 	if require"cmp.config.context".in_treesitter_capture("comment")==true or require"cmp.config.context".in_syntax_group("Comment") then
-		-- 		return false
-		-- 	else
-		-- 		return true
-		-- 	end
-		-- end,
-		-- preselect = false,
-		view = {
-			entries = { name = 'custom', selection_order = 'near_cursor' },
-		},
-		window = {
-			documentation = borderstyle,
-			completion = borderstyle
-		},
-		mapping = {
-			["<Up>"] = selectPrev,
-			["<S-Tab>"] = selectPrev,
-			["<Down>"] = selectNext,
-			["<Tab>"] = selectNext,
-			["<esc>"] = cmp.mapping.abort(),
-			['<CR>'] = cmp.mapping.confirm({ select = true }),
-		},
-		snippet = {
-			expand = function(args)
-				require('luasnip').lsp_expand(args.body)
-			end,
-		},
-		formatting = {
-			fields = { "abbr", "kind", "menu" },
-			format = function(entry, vim_item)
-				if vim.tbl_contains({ 'path' }, entry.source.name) then
-					local icon, hl_group = require('nvim-web-devicons').get_icon(entry:get_completion_item().label)
-					if icon then
-						vim_item.kind = icon
-						vim_item.kind_hl_group = hl_group
-						return vim_item
-					end
-				end
-
-				return require('lspkind').cmp_format(lspkind_config)(entry, vim_item)
-			end
-		},
-		sources = {
-			{ name = "copilot" },
-			{ name = 'nvim_lsp' },
-			{ name = 'buffer' },
-			{ name = 'path' },
-			{ name = 'luasnip' }
-		},
-		experimental = {
-			ghost_text = {
-				hl_group = "NonText",
-			},
-		},
-	}
+    return {
+        preselect = false,
+        view = {
+            entries = { name = 'custom', selection_order = 'near_cursor' },
+        },
+        window = {
+            documentation = borderstyle,
+            completion = borderstyle
+        },
+        mapping = {
+            ["<Up>"] = selectPrev,
+            ["<S-Tab>"] = selectPrev,
+            ["<Down>"] = selectNext,
+            ["<Tab>"] = selectNext,
+            ["<S-c>"] = cmp.mapping.abort(),
+            ['<CR>'] = cmp.mapping.confirm({ select = true }),
+        },
+        snippet = {
+            expand = function(args)
+                require('luasnip').lsp_expand(args.body)
+            end,
+        },
+        formatting = {
+            fields = { "abbr", "kind", "menu" },
+            format = lspkind.format({
+                mode = 'symbol',
+                preset = 'codicons',
+                symbol_map = icons.symbols,
+                maxwidth = 40,
+                ellipsis_char = "...",
+            }),
+        },
+        sources = {
+            { name = "copilot" },
+            { name = 'nvim_lsp' },
+            { name = 'buffer' },
+            { name = 'path' },
+            { name = 'luasnip' }
+        },
+        experimental = {
+            ghost_text = {
+                hl_group = "NonText",
+            },
+        },
+    }
 end

nvim/lua/config/plugins/comment.lua

@@ -13,8 +13,8 @@ return {
 		-- Toggle comment on visual selection
 		comment_visual = '<leader>/',
 
-		-- Define 'comment' textobject (like `dgc` - delete whole comment block)
+		-- Define 'comment' textobject (like `dg/` - delete whole comment block)
 		-- Works also in Visual mode if mapping differs from `comment_visual`
-		textobject = 'gc',
+		textobject = 'g/',
 	}
 }

nvim/lua/config/plugins/laravel.lua

@@ -1,7 +1,9 @@
 return {
 	keys = {
-		["<leader>la"] = { ":Laravel artisan<cr>", "Run artisan" },
-		["<leader>lr"] = { ":Laravel routes<cr>", "Search routes" },
-		["<leader>lm"] = { ":Laravel related<cr>", "Related" },
+		["<leader>la"] = { "<cmd>Laravel artisan<cr>", "Run artisan" },
+		["<leader>lm"] = { "<cmd>Laravel make<cr>", "Make" },
+		["<leader>lr"] = { "<cmd>Laravel routes<cr>", "Search routes" },
+		["<leader>lR"] = { "<cmd>Laravel related<cr>", "Related" },
+		["<leader>lv"] = { "<cmd>Laravel view-finder<cr>", "View finder" },
 	},
 }

nvim/lua/config/plugins/lsp.lua

@@ -1,65 +1,74 @@
 return {
-	mappings = {
-		["<leader>rs"] = { vim.lsp.buf.rename, { desc = "Rename symbol" }},
-		["<leader>ca"] = { vim.lsp.buf.code_action, { desc = "Code action" }},
-		["<leader>ff"] = { vim.lsp.buf.format, { desc = "Format file" }},
-		gd = { vim.lsp.buf.definition, { desc = "Goto definition" }},
-		gi = { vim.lsp.buf.implementation, { desc = "Goto implementation"}},
-		gr = { vim.lsp.buf.references, { desc = "Goto references"}},
-	},
-	servers = {
-		-- PHP
-		phpactor = {
-			settings = {
-				init_options = {
-					["language_server_phpstan.enabled"] = true,
-					["language_server_psalm.enabled"] = false,
-				}
-			}
-		},
-		-- GO
-		gopls = {
-			-- format_on_save = true,
-			on_save = function ()
-				local params = vim.lsp.util.make_range_params()
-				params.context = {only = {"source.organizeImports"}}
-				local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 1000)
-				for cid, res in pairs(result or {}) do
-					for _, r in pairs(res.result or {}) do
-						if r.edit then
-							local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16"
-							vim.lsp.util.apply_workspace_edit(r.edit, enc)
-						end
-					end
-				end
-				vim.lsp.buf.format({async = false})
-			end,
-			settings = {
-				gopls = {
-					analyses = {
-						unusedvariable = true,
-						unusedwrite = true,
-						useany = true
-					},
-					gofumpt = true,
-				},
-			},
-		},
-		-- Lua
-		lua_ls = {
-			settings = {
-				Lua = {
-					runtime = {
-						version = 'LuaJIT'
-					},
-					workspace = {
-						checkThirdParty = false,
-						library = {
-							vim.env.VIMRUNTIME
-						}
-					}
-				},
-			},
-		},
-	},
+    mappings = {
+        ["<leader>rs"] = { vim.lsp.buf.rename, { desc = "Rename symbol" } },
+        ["<leader>ca"] = { vim.lsp.buf.code_action, { desc = "Code action" } },
+        ["<leader>ff"] = { vim.lsp.buf.format, { desc = "Format file" } },
+        K = { vim.lsp.buf.hover, { desc = "Hover" } },
+        gd = { vim.lsp.buf.definition, { desc = "Goto definition" } },
+        gi = { vim.lsp.buf.implementation, { desc = "Goto implementation" } },
+        gr = { vim.lsp.buf.references, { desc = "Goto references" } },
+    },
+    servers = {
+        -- PHP
+        -- phpactor = {
+        --     settings = {
+        --         init_options = {
+        --             ["language_server_phpstan.enabled"] = true,
+        --             ["language_server_psalm.enabled"] = false,
+        --         }
+        --     }
+        -- },
+        --
+        --
+        -- JS,TS,VUE
+        volar = {
+            filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' }
+        },
+        -- TailwindCSS
+        tailwindcss = {},
+        -- GO
+        gopls = {
+            -- format_on_save = true,
+            on_save = function()
+                local params = vim.lsp.util.make_range_params()
+                params.context = { only = { "source.organizeImports" } }
+                local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 1000)
+                for cid, res in pairs(result or {}) do
+                    for _, r in pairs(res.result or {}) do
+                        if r.edit then
+                            local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16"
+                            vim.lsp.util.apply_workspace_edit(r.edit, enc)
+                        end
+                    end
+                end
+                vim.lsp.buf.format({ async = false })
+            end,
+            settings = {
+                gopls = {
+                    analyses = {
+                        unusedvariable = true,
+                        unusedwrite = true,
+                        useany = true
+                    },
+                    gofumpt = true,
+                },
+            },
+        },
+        -- Lua
+        lua_ls = {
+            settings = {
+                Lua = {
+                    runtime = {
+                        version = 'LuaJIT'
+                    },
+                    workspace = {
+                        checkThirdParty = false,
+                        library = {
+                            vim.env.VIMRUNTIME
+                        }
+                    }
+                },
+            },
+        },
+    },
 }

nvim/lua/config/plugins/lualine.lua

@@ -0,0 +1,93 @@
+local icons = require('config.icons')
+local separator = { "'" .. icons.separator .. "'", color = 'StatusLineSeparator' }
+
+return {
+	options = {
+		globalstatus = true,
+		component_separators = '',
+		section_separators = '',
+		disabled_filetypes = {
+			statusline = {
+				'dashboard',
+			}
+		},
+		theme = {
+			normal = {
+				a = "StatusLineNormal",
+				b = "StatusLine",
+				c = "StatusLine",
+				x = "StatusLine",
+				y = "StatusLine",
+				z = "StatusLine",
+			},
+			command = {
+				a = "StatusLineCommand",
+				z = "StatusLine",
+			},
+			insert = {
+				a = "StatusLineInsert",
+				z = "StatusLine",
+			},
+			visual = {
+				a = "StatusLineVisual",
+				z = "StatusLine",
+			},
+            replace = {
+				a = "StatusLineReplace",
+				z = "StatusLine",
+			}
+		}
+	},
+	sections = {
+		lualine_a = {
+			"mode",
+		},
+		lualine_b = {
+			separator,
+			"branch",
+            separator,
+            '" " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
+            {
+                require("lazy.status").updates,
+                cond = require("lazy.status").has_updates,
+                color = { fg = "#ff9e64" },
+            },
+			{
+				"diagnostics",
+				symbols = {
+					error = icons.diagnostics.error .. ' ',
+					warn = icons.diagnostics.warn .. ' ',
+					info = icons.diagnostics.info .. ' ',
+					hint = icons.diagnostics.hint .. ' ',
+				},
+			},
+			{
+				"diff",
+				symbols = {
+					added = icons.diff.added .. ' ',
+					modified = icons.diff.modified .. ' ',
+					removed = icons.diff.removed .. ' '
+				}
+			},
+            separator,
+		},
+		lualine_c = {
+			'filename'
+		},
+		lualine_x = {
+			'filetype',
+			'fileformat',
+			'(vim.bo.expandtab and "SPC" or "TAB") .. " " .. vim.bo.shiftwidth',
+		},
+		lualine_y = {
+			separator,
+			'location',
+			'progress'
+		},
+		lualine_z = {}
+	},
+	extensions = {
+		'lazy',
+		'neo-tree'
+	}
+}

nvim/lua/config/plugins/telescope.lua

@@ -10,10 +10,15 @@ return {
 		{ '<leader>sg', '<cmd>Telescope git_files<cr>', desc = 'Search Git files' },
 		{ '<leader>so', '<cmd>Telescope oldfiles<cr>', desc = 'Search Old files' },
 		{ '<leader>sw', '<cmd>Telescope grep_string<cr>', desc = 'Search for word under cursor' },
+		{ '<leader>sd', '<cmd>Telescope diagnostics<cr>', desc = 'Search Diagnostics' },
+		{ '<leader>sq', '<cmd>Telescope quickfix<cr>', desc = 'Search Quickfix' },
+		{ '<leader>sh', '<cmd>Telescope help<cr>', desc = 'Search Neovim help' },
 		-- LSP
 		{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
 		{ '<leader>ss', '<cmd>Telescope lsp_document_symbols<cr>', desc = 'Search document symbols' },
 		{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
+		{ '<leader>si', '<cmd>Telescope lsp_implementations<cr>', desc = 'Search Inplementations' },
+		{ '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>', desc = 'Search Workspace symbols' },
 		{ 'gd', '<cmd>Telescope lsp_definitions<cr>', desc = 'Goto definition' },
 	},
 	opts = function()

nvim/lua/config/plugins/trouble.lua

@@ -0,0 +1,10 @@
+return {
+    keys = {
+        { "<leader>xx", function() require("trouble").toggle() end },
+        { "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end },
+        { "<leader>xd", function() require("trouble").toggle("document_diagnostics") end },
+        { "<leader>xq", function() require("trouble").toggle("quickfix") end },
+        { "<leader>xl", function() require("trouble").toggle("loclist") end },
+        { "gR", function() require("trouble").toggle("lsp_references") end },
+    },
+}

nvim/lua/config/plugins/which-key.lua

@@ -3,7 +3,8 @@ return {
 		mode = { "n", "v" },
 		["<leader>r"] = { name = "+rename" },
 		["<leader>b"] = { name = "+buffers" },
-		["<leader>f"] = { name = "+files" },
+		["<leader>f"] = { name = "+format" },
+		["<leader>F"] = { name = "+files" },
 		["<leader>d"] = { name = "+diagnostics" }
 	}
 }