feat(nvim): neovim config rewrite

2 files changed, 174 insertions, 0 deletions

diff --git a/dot_config/nvim/plugin/keymaps.lua b/dot_config/nvim/plugin/keymaps.lua
new file mode 100644
index 0000000..8f5ff28
--- /dev/null
+++ b/dot_config/nvim/plugin/keymaps.lua
@@ -0,0 +1,139 @@
+-- Set leader key as Space
+vim.g.mapleader = " "
+
+local function map(mode, left, right, opts)
+	local default_opts = {
+		noremap = true,
+		silent = true,
+	}
+	opts = opts or {}
+	-- "keep" mode preserves the values from the leftmost table,
+	-- so prioritize any options provided over the defaults
+	local full_opts = vim.tbl_extend("keep", opts, default_opts)
+	vim.keymap.set(mode, left, right, full_opts)
+end
+
+-- Clear any highlighted searches when pressing Esc
+-- This lets me leave hlsearch on by default while having an easy way to clear
+-- it again.
+map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
+
+-- Move lines while in visual mode with J and K
+map("v", "J", ":m '>+1<CR>gv=gv")
+map("v", "K", ":m '<-2<CR>gv=gv")
+
+-- Easier execution of Lua code
+map("n", "<leader>x", "<cmd>.lua<CR>", { desc = "Execute the current line" })
+map("n", "<leader><leader>x", "<cmd>source %<CR>", { desc = "Execute the current file" })
+
+-- Keep cursor in the same place when using J to join lines
+map("n", "J", "mzJ`z")
+
+-- Center the screen when jumping around with C-d and C-u
+map("n", "<C-d>", "<C-d>zz")
+map("n", "<C-u>", "<C-u>zz")
+
+-- Center the screen when jumping to next / previous search terms
+map("n", "n", "nzzzv")
+map("n", "N", "Nzzzv")
+
+-- Quick maps to paste/delete without overwriting the current buffer
+map("x", "<leader>p", '"_dP')
+map({ "n", "v" }, "<leader>d", '"_dP')
+
+-- Easier quickfix naviagion
+map("n", "<C-k>", "<cmd>cprev<cr>", { desc = "Quickfix previous item" })
+map("n", "<C-j>", "<cmd>cnext<cr>", { desc = "Quickfix next item" })
+
+-- System clipboard
+map({ "n", "v" }, "<leader>cd", '"+d', { desc = "Clipboard delete" })
+map({ "n", "v" }, "<leader>cp", '"+p', { desc = "Clipboard paste" })
+map({ "n", "v" }, "<leader>cy", '"+y', { desc = "Clipboard yank" })
+
+-- Map g- to netrw (temporary placeholder for oil)
+-- map("n", "g-", vim.cmd.Ex, { desc = "Open netrw" })
+
+map("n", "<leader>gx", function()
+	local command = "go run " .. vim.fn.expand("%")
+	local f = assert(io.popen(command, "r"))
+	local s = assert(f:read("*a"))
+	f:close()
+	s = string.gsub(s, "^%s+", "")
+	s = string.gsub(s, "%s+$", "")
+	s = string.gsub(s, "[\n\r]+", " ")
+	print(s)
+end, { desc = "Execute current go file" })
+
+-- LSP specific keybindings
+vim.api.nvim_create_autocmd("LspAttach", {
+	group = vim.api.nvim_create_augroup("IbrahimLspConfig", {}),
+	callback = function(evt)
+		local function lsp_map(mode, lhs, rhs, desc)
+			local opts = { buffer = evt.buf, desc = "LSP: " .. (desc or "") }
+			map(mode, lhs, rhs, opts)
+		end
+
+		local has_telescope, _ = pcall(require, "telescope")
+		local function lsp_telescope_map(mode, lhs, with_telescope_rhs, no_telescope_rhs, desc)
+			if has_telescope then
+				desc = desc .. " (Telescope)"
+				lsp_map(mode, lhs, with_telescope_rhs, desc)
+			else
+				lsp_map(mode, lhs, no_telescope_rhs, desc)
+			end
+		end
+		local function tele_builtin(name, opts)
+			return function()
+				require("telescope.builtin")[name](opts)
+			end
+		end
+
+		-- Navigation
+		lsp_map("n", "gd", vim.lsp.buf.definition, "[G]oto [D]efinition")
+		lsp_map("n", "gt", vim.lsp.buf.type_definition, "[G]oto [t]ype Definition")
+		lsp_map("n", "gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+		lsp_map("n", "gr", vim.lsp.buf.references, "[G]oto [R]eferences")
+		lsp_map("n", "gI", vim.lsp.buf.implementation, "[G]oto [I]mplementation")
+
+		lsp_telescope_map("n", "gr", tele_builtin("lsp_references"), vim.lsp.buf.references, "Go to references")
+		lsp_telescope_map(
+			"n",
+			"<leader>sn",
+			tele_builtin("lsp_document_symbols"),
+			vim.lsp.buf.document_symbol,
+			"Search document symbols"
+		)
+		lsp_telescope_map(
+			"n",
+			"<leader>sN",
+			tele_builtin("lsp_dynamic_workspace_symbols"),
+			vim.lsp.buf.workspace_symbol,
+			"Search workspace symbols"
+		)
+
+		-- Code changes
+		lsp_map("n", "<leader>cr", vim.lsp.buf.rename, "Rename")
+		-- <leader>ca is being overwritten by the 'actions-preview' plugin
+		-- lsp_map("n", "<leader>ca", vim.lsp.buf.code_action, "Code actions")
+
+		-- Diagnostics
+		lsp_map("n", "<leader>ds", vim.diagnostic.open_float, "[s]how [d]iagnostic window")
+		lsp_map("n", "<leader>dn", function()
+			vim.diagnostic.goto_next({ float = true })
+		end, "Go to [n]ext [d]iagnostic")
+		lsp_map("n", "<leader>dp", function()
+			vim.diagnostic.goto_prev({ float = true })
+		end, "Go to [p]revious [d]iagnostic")
+
+		-- See `:help K` for why this keymap
+		lsp_map("n", "K", vim.lsp.buf.hover, "Hover Documentation")
+		lsp_map("n", "<C-S-k>", vim.lsp.buf.signature_help, "Signature Documentation")
+
+		-- Workspace
+		lsp_map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder")
+		lsp_map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder")
+		lsp_map("n", "<leader>wl", function()
+			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+		end, "[W]orkspace [L]ist Folders")
+	end,
+})
diff --git a/dot_config/nvim/plugin/options.lua b/dot_config/nvim/plugin/options.lua
new file mode 100644
index 0000000..044f24f
--- /dev/null
+++ b/dot_config/nvim/plugin/options.lua
@@ -0,0 +1,35 @@
+local opt = vim.opt
+
+opt.incsearch = true
+
+opt.number = true
+opt.relativenumber = true
+
+opt.scrolloff = 8
+
+vim.o.foldtext = ""
+opt.foldlevelstart = 1
+
+opt.conceallevel = 2
+
+opt.tabstop = 4
+opt.softtabstop = 4
+opt.shiftwidth = 0
+opt.expandtab = true
+
+opt.autoindent = true
+opt.smartindent = true
+opt.breakindent = true
+
+opt.swapfile = false
+opt.backup = false
+opt.undodir = vim.fn.expand("~/.vim/undodir")
+opt.undofile = true
+
+opt.ignorecase = true
+opt.smartcase = true
+
+opt.updatetime = 250
+
+vim.o.background = "dark"
+vim.cmd([[colorscheme gruvbox]])