refactor: simplify config

init.lua

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

lazy-lock.json

@@ -1,35 +1,31 @@
 {
-  "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
+  "LazyVim": { "branch": "main", "commit": "fca0af57cc3851b14f96a795a9c9bfafc5096dd1" },
   "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
-  "catppuccin": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" },
-  "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
+  "catppuccin": { "branch": "main", "commit": "c4d475e4b5684747cde9b3f849186af7837d4397" },
+  "conform.nvim": { "branch": "master", "commit": "40dcec5555f960b0a04340d76eabdf4efe78599d" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
-  "gruvbox-material": { "branch": "master", "commit": "790afe9dd085aa04eccd1da3626c5fa05c620e53" },
+  "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": "21c2a84ce368e99b18f52ab348c4c02c32c02fcf" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "mini.ai": { "branch": "main", "commit": "b0247752cf629ce7c6bd0a1efd82fb58ff60f9d6" },
-  "mini.icons": { "branch": "main", "commit": "68c178e0958d95b3977a771f3445429b1bded985" },
-  "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
-  "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
-  "neotest-pest": { "branch": "main", "commit": "1429445746f28a4ce887289ea6e442430629e306" },
-  "neotest-phpunit": { "branch": "main", "commit": "2761ae9e9a385e491a9731f8c52824e1be64a68f" },
+  "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": "486474c2ace8d78d28995074dbdbe29011bc63d0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
+  "nvim-lspconfig": { "branch": "master", "commit": "2163c54bb6cfec53e3e555665ada945b8c8331b9" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "main", "commit": "fcd51bbe9245aa9b79a3930ed9ac42e16e1cf33f" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
+  "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": "cf2a288696b03d0934da713d66c6d71557b5c997" },
-  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
+  "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,11 +1,6 @@
 {
-  "extras": [
-    "lazyvim.plugins.extras.editor.snacks_explorer",
-    "lazyvim.plugins.extras.editor.snacks_picker",
-    "lazyvim.plugins.extras.lang.php",
-    "lazyvim.plugins.extras.test.core"
-  ],
-  "install_version": 7,
+  "extras": [],
+  "install_version": 8,
   "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,18 +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
-
--- Use inttelepehnse instead of phpactor
-global.lazyvim_php_lsp = "intelephense"
+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,28 +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,
-			},
+			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 },
 }