refactor: cleanup config

config/nvim/config/keymaps.lua

@@ -1,24 +1,21 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here
 local keymap = vim.keymap.set
 local delkeymap = vim.keymap.del
 local opts = { noremap = true, silent = true }
 
--- Better line start/end
+-- Improved line start/end
 keymap("n", "H", "^", opts)
 keymap("n", "L", "$", opts)
 keymap("v", "H", "^", opts)
 keymap("v", "L", "$", opts)
 
--- Better escape
+-- Improved escape
 keymap("n", "<ESC>", "<ESC>:noh<CR>", opts)
 keymap("t", "<ESC><ESC>", "<C-\\><C-n>", opts)
 
--- Disable alt j/k to move lines
-delkeymap({ "i", "v" }, "<A-j>")
-delkeymap({ "i", "v" }, "<A-k>")
-
--- Better <ctrl> + movement
+-- Improved <ctrl> + movement
 keymap("n", "<C-d>", "<C-d>zz", opts)
 keymap("n", "<C-u>", "<C-u>zz", opts)
+
+-- Disable alt j/k to move lines (conflict with default vim motions)
+delkeymap({ "i", "v" }, "<A-j>")
+delkeymap({ "i", "v" }, "<A-k>")

config/nvim/lazyvim.json

@@ -8,8 +8,5 @@
     "lazyvim.plugins.extras.lang.typescript",
     "lazyvim.plugins.extras.test.core"
   ],
-  "news": {
-    "NEWS.md": "6520"
-  },
-  "version": 6
+  "version": 7
 }

config/nvim/plugins/autocomplete.lua

@@ -1,10 +0,0 @@
--- Disable autocomplete on enter.
-return {
-	"hrsh7th/nvim-cmp",
-	opts = function(_, opts)
-		local cmp = require("cmp")
-		opts.mapping = vim.tbl_deep_extend("force", opts.mapping, {
-			["<CR>"] = cmp.config.disable,
-		})
-	end,
-}

config/nvim/plugins/colorscheme.lua

@@ -1,12 +1,9 @@
+-- Configure rose-pine and gruvbox-material colorschemes.
 return {
 	{ "rose-pine/neovim" },
+	{ "sainnhe/gruvbox-material" },
 	{
-		"sainnhe/gruvbox-material",
-		opts = function()
-			vim.g.gruvbox_material_foreground = "original"
-		end,
-	},
-	{
+		-- Set default colorscheme.
 		"LazyVim/LazyVim",
 		opts = {
 			colorscheme = "gruvbox-material",

config/nvim/plugins/disabled.lua

@@ -1,13 +1,32 @@
--- Disable some unneeded plugins by default.
+-- Disable unused plugins and functionality.
 return {
 	{
+		-- Disable the dashboard.
 		"folke/snacks.nvim",
 		opts = function(_, opts)
 			opts.dashboard = { enabled = false }
 		end,
 	},
 	{
+		-- Disable the bufferline.
 		"bufferline.nvim",
 		enabled = false,
 	},
+	{
+		-- Disable inline hints by default.
+		"neovim/nvim-lspconfig",
+		opts = {
+			inlay_hints = { enabled = false },
+		},
+	},
+	{
+		"hrsh7th/nvim-cmp",
+		opts = function(_, opts)
+			-- Disable autocomplete on enter.
+			local cmp = require("cmp")
+			opts.mapping = vim.tbl_deep_extend("force", opts.mapping, {
+				["<CR>"] = cmp.config.disable,
+			})
+		end,
+	},
 }

config/nvim/plugins/lsp.lua

@@ -1,7 +0,0 @@
--- Disable inline hints by default.
-return {
-	"neovim/nvim-lspconfig",
-	opts = {
-		inlay_hints = { enabled = false },
-	},
-}