refactor: simplify config

init.lua

@@ -1,2 +1 @@
--- bootstrap lazy.nvim, LazyVim and your plugins
 require("config.lazy")

lazy-lock.json

@@ -1,33 +1,32 @@
 {
-  "LazyVim": { "branch": "main", "commit": "0329bc0e508eb48f7cee7fe57975c364584f8738" },
-  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
-  "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" },
-  "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "3ec1ffb25365a6b3d87e510b1175342a61bf91a2" },
-  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
-  "gruvbox-material": { "branch": "master", "commit": "834dbf21836862300ced7444db4262b796330ab7" },
-  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
-  "lazydev.nvim": { "branch": "main", "commit": "01bc2aacd51cf9021eb19d048e70ce3dd09f7f93" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "83db0174efbac2d69fd45afef269b47dfedadbe1" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
-  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
-  "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" },
-  "neo-tree.nvim": { "branch": "main", "commit": "0d0b29a529216d41173c9c5c8a8f484db5b891ba" },
-  "noice.nvim": { "branch": "main", "commit": "c86aea584d98be7ee1167ce4d4ef946fbd7f3ae0" },
+  "LazyVim": { "branch": "main", "commit": "fca0af57cc3851b14f96a795a9c9bfafc5096dd1" },
+  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
+  "catppuccin": { "branch": "main", "commit": "c4d475e4b5684747cde9b3f849186af7837d4397" },
+  "conform.nvim": { "branch": "master", "commit": "40dcec5555f960b0a04340d76eabdf4efe78599d" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "laravel.nvim": { "branch": "main", "commit": "4e48d7a5783155475f578da2ec85451c50f41fe7" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" },
+  "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" },
+  "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69" },
-  "nvim-treesitter": { "branch": "main", "commit": "9ee023538e072163cc541f29bc74214f7b0b90f6" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
-  "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
+  "nvim-lspconfig": { "branch": "master", "commit": "2163c54bb6cfec53e3e555665ada945b8c8331b9" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-treesitter": { "branch": "main", "commit": "ebe76eb800d4e8df754fc96f8a7b84f578224a97" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "0bc4ef0a34d80fd6e67b59bd71fcbb0ef9ef4756" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
-  "snacks.nvim": { "branch": "main", "commit": "d569072b2e39e0078b55ea56b133fb9a30d78bad" },
-  "tokyonight.nvim": { "branch": "main", "commit": "4fe1b0c44f5d6ee769cdfbdffc7ccb703f53feda" },
-  "ts-comments.nvim": { "branch": "main", "commit": "217ab9cc137fceb6659b53790bd25e608219abe1" },
-  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
+  "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
+  "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

lazyvim.json

@@ -1,5 +1,8 @@
 {
-  "extras": [],
+  "extras": [
+    "lazyvim.plugins.extras.editor.snacks_explorer",
+    "lazyvim.plugins.extras.editor.snacks_picker"
+  ],
   "install_version": 7,
   "news": {
     "NEWS.md": "11866"

lua/config/keymaps.lua

@@ -1,12 +0,0 @@
--- Configure custom keymaps.
-local keymap = vim.keymap.set
-local delkeymap = vim.keymap.del
-local opts = { noremap = true, silent = true }
-
--- Improved escape
-keymap("n", "<ESC>", "<ESC>:noh<CR>", opts)
-keymap("t", "<ESC><ESC>", "<C-\\><C-n>", opts)
-
--- Disable alt j/k to move lines (conflict with default vim motions)
-delkeymap({ "i", "v" }, "<A-j>")
-delkeymap({ "i", "v" }, "<A-k>")

lua/config/options.lua

@@ -1,15 +1,4 @@
--- Set some custom options.
-local opt = vim.o
-local global = vim.g
-
--- Set target text width for gww to 60.
-opt.tw = 60
-
--- Use the internal clipboard.
-opt.clipboard = ""
-
--- Use original gruvbox theme.
-global.gruvbox_material_foreground = "original"
-
--- Disable snack animations.
-global.snacks_animate = false
+vim.o.tw = 60
+vim.o.clipboard = ""
+vim.g.snacks_animate = false
+vim.g.lazyvim_php_lsp = "intelephense"

lua/plugins/colorscheme.lua

@@ -1,9 +1,7 @@
--- Configure rose-pine and gruvbox-material colorschemes.
 return {
 	{ "rose-pine/neovim", name = "rose-pine" },
-	{ "sainnhe/gruvbox-material" },
 	{
 		"LazyVim/LazyVim",
-		opts = { colorscheme = "gruvbox-material" },
+		opts = { colorscheme = "rose-pine" },
 	},
 }

lua/plugins/disabled.lua

@@ -1,25 +1,26 @@
--- Disable unused plugins and functionality.
 return {
 	{
-		-- Disable the dashboard.
 		"folke/snacks.nvim",
 		opts = {
 			dashboard = { enabled = false },
-			notifier = { level = vim.log.levels.WARN },
+			explorer = { trash = false },
 		},
 	},
 	{
-		-- Disable inline hints by default.
 		"neovim/nvim-lspconfig",
 		opts = {
 			inlay_hints = { enabled = false },
 		},
 	},
-
-	-- Disable unused plugins.
+	{ "akinsho/bufferline.nvim", enabled = false },
 	{ "folke/flash.nvim", enabled = false },
+	{ "rafamadriz/friendly-snippets", enabled = false },
+
+	{ "catppuccin/nvim", enabled = false },
+	{ "folke/tokyonight.nvim", enabled = false },
+
 	{ "folke/todo-comments.nvim", enabled = false },
+	{ "folke/ts-comments.nvim", enabled = false },
 	{ "folke/trouble.nvim", enabled = false },
 	{ "MagicDuck/grug-far.nvim", enabled = false },
-	{ "akinsho/bufferline.nvim", enabled = false },
 }

lua/plugins/php.lua

@@ -0,0 +1,136 @@
+return {
+	{
+		-- Set Laravel Pint as the default PHP formatter with PHP CS Fixer as a fall back.
+		"stevearc/conform.nvim",
+		optional = true,
+		opts = {
+			formatters_by_ft = {
+				php = { { "pint", "php_cs_fixer" } },
+			},
+		},
+	},
+	{
+		-- Remove phpcs linter.
+		"mfussenegger/nvim-lint",
+		optional = true,
+		opts = {
+			linters_by_ft = {
+				php = {},
+			},
+		},
+	},
+	{
+		"adalessa/laravel.nvim",
+		dependencies = {
+			"MunifTanjim/nui.nvim",
+			"nvim-lua/plenary.nvim",
+			"nvim-neotest/nvim-nio",
+		},
+		ft = { "php", "blade" },
+		event = {
+			"BufEnter composer.json",
+		},
+		keys = {
+			{
+				"<leader>ll",
+				function()
+					Laravel.pickers.laravel()
+				end,
+				desc = "Laravel: Open Laravel Picker",
+			},
+			{
+				"<c-g>",
+				function()
+					Laravel.commands.run("view:finder")
+				end,
+				desc = "Laravel: Open View Finder",
+			},
+			{
+				"<leader>la",
+				function()
+					Laravel.pickers.artisan()
+				end,
+				desc = "Laravel: Open Artisan Picker",
+			},
+			{
+				"<leader>lt",
+				function()
+					Laravel.commands.run("actions")
+				end,
+				desc = "Laravel: Open Actions Picker",
+			},
+			{
+				"<leader>lr",
+				function()
+					Laravel.pickers.routes()
+				end,
+				desc = "Laravel: Open Routes Picker",
+			},
+			{
+				"<leader>lh",
+				function()
+					Laravel.run("artisan docs")
+				end,
+				desc = "Laravel: Open Documentation",
+			},
+			{
+				"<leader>lm",
+				function()
+					Laravel.pickers.make()
+				end,
+				desc = "Laravel: Open Make Picker",
+			},
+			{
+				"<leader>lc",
+				function()
+					Laravel.pickers.commands()
+				end,
+				desc = "Laravel: Open Commands Picker",
+			},
+			{
+				"<leader>lo",
+				function()
+					Laravel.pickers.resources()
+				end,
+				desc = "Laravel: Open Resources Picker",
+			},
+			{
+				"<leader>lp",
+				function()
+					Laravel.commands.run("command_center")
+				end,
+				desc = "Laravel: Open Command Center",
+			},
+			{
+				"<leader>lu",
+				function()
+					Laravel.commands.run("hub")
+				end,
+				desc = "Laravel Artisan hub",
+			},
+			{
+				"gf",
+				function()
+					local ok, res = pcall(function()
+						if Laravel.app("gf").cursorOnResource() then
+							return "<cmd>lua Laravel.commands.run('gf')<cr>"
+						end
+					end)
+					if not ok or not res then
+						return "gf"
+					end
+					return res
+				end,
+				expr = true,
+				noremap = true,
+			},
+		},
+		opts = {
+			features = {
+				pickers = {
+					provider = "snacks",
+				},
+			},
+		},
+	},
+}