From c3c96328c9c758cf9d57579344d3c20b6d29ece6 Mon Sep 17 00:00:00 2001
From: Tomas Mirchev <contact@tomastm.com>
Date: Tue, 25 Feb 2025 11:00:15 +0100
Subject: [PATCH] update simple nvim

---
 config.json        |  2 +-
 config/shared/nvim | 79 +++++++++++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/config.json b/config.json
index 9b9a83c..f0a1793 100644
--- a/config.json
+++ b/config.json
@@ -11,7 +11,7 @@
       "-post-link": "curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim && vim -es -u ~/.vimrc -i NONE -c 'PlugInstall' -c 'qa'"
     },
     "nvim": {
-      "link": { "from": "shared/nvim", "to": "~/.config/nvim" }
+      "link": { "from": "shared/nvim", "to": "~/.config/nvim/init.lua" }
     },
     "zsh": {
       "link": { "from": "shared/zsh", "to": "~/.zshrc" }
diff --git a/config/shared/nvim b/config/shared/nvim
index e3c38c7..863b000 100644
--- a/config/shared/nvim
+++ b/config/shared/nvim
@@ -1,3 +1,26 @@
+-- Helper function for key mappings
+local function map(mode, lhs, rhs, opts)
+    local options = { silent = true, noremap = true }
+
+    if opts then
+        options = vim.tbl_extend("force", options, opts)
+    end
+
+    if type(mode) == "table" then
+        for _, m in ipairs(mode) do
+            vim.keymap.set(m, lhs, rhs, options)
+        end
+    else
+        vim.keymap.set(mode, lhs, rhs, options)
+    end
+end
+
+-- Mode-specific mapping functions
+local function nmap(lhs, rhs, opts) map("n", lhs, rhs, opts) end
+local function imap(lhs, rhs, opts) map("i", lhs, rhs, opts) end
+local function vmap(lhs, rhs, opts) map("v", lhs, rhs, opts) end
+local function tmap(lhs, rhs, opts) map("t", lhs, rhs, opts) end
+
 -- Map Leader
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
@@ -87,52 +110,50 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 
 -- Keymaps
 
-local remap = require("utils.remap")
+nmap("<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" })
 
-remap.nmap("<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" })
-
-remap.imap("jk", "<Esc>", { desc = "Exit insert mode with jk" })
-remap.nmap("<Esc>", "<cmd>nohlsearch<CR>", { desc = "Clear highlights" })
+imap("jk", "<Esc>", { desc = "Exit insert mode with jk" })
+nmap("<Esc>", "<cmd>nohlsearch<CR>", { desc = "Clear highlights" })
 
 -- Prevent "x" from overriding the register
-remap.nmap("x", '"_x')
+nmap("x", '"_x')
 
 --  Window Navigation
-remap.nmap("<C-h>", "<C-w>h", { desc = "Move focus to the left window" })
-remap.nmap("<C-l>", "<C-w>l", { desc = "Move focus to the right window" })
-remap.nmap("<C-j>", "<C-w>j", { desc = "Move focus to the lower window" })
-remap.nmap("<C-k>", "<C-w>k", { desc = "Move focus to the upper window" })
+nmap("<C-h>", "<C-w>h", { desc = "Move focus to the left window" })
+nmap("<C-l>", "<C-w>l", { desc = "Move focus to the right window" })
+nmap("<C-j>", "<C-w>j", { desc = "Move focus to the lower window" })
+nmap("<C-k>", "<C-w>k", { desc = "Move focus to the upper window" })
 
 -- Tab management
-remap.nmap("<Leader>tn", ":tabnew<CR>", { desc = "[T]ab [N]ew" })
-remap.nmap("<Leader>tc", ":tabclose<CR>", { desc = "[T]ab [C]lose" })
-remap.nmap("<Leader>to", ":tabonly<CR>", { desc = "[T]ab [O]nly" })
-remap.nmap("<Leader>tl", ":tabnext<CR>", { desc = "[T]ab Next" })
-remap.nmap("<Leader>th", ":tabprevious<CR>", { desc = "[T]ab Previous" })
-remap.nmap("<Leader>tm.", ":tabmove +1<CR>", { desc = "[T]ab [M]ove Right" })
-remap.nmap("<Leader>tm,", ":tabmove -1<CR>", { desc = "[T]ab [M]ove Left" })
+nmap("<Leader>tn", ":tabnew<CR>", { desc = "[T]ab [N]ew" })
+nmap("<Leader>tc", ":tabclose<CR>", { desc = "[T]ab [C]lose" })
+nmap("<Leader>to", ":tabonly<CR>", { desc = "[T]ab [O]nly" })
+nmap("<Leader>tl", ":tabnext<CR>", { desc = "[T]ab Next" })
+nmap("<Leader>th", ":tabprevious<CR>", { desc = "[T]ab Previous" })
+nmap("<Leader>tm.", ":tabmove +1<CR>", { desc = "[T]ab [M]ove Right" })
+nmap("<Leader>tm,", ":tabmove -1<CR>", { desc = "[T]ab [M]ove Left" })
 for i = 1, 9 do
-	remap.nmap(string.format("<Leader>%d", i), string.format("%dgt", i), { desc = string.format("[T]ab %d", i) })
+	nmap(string.format("<Leader>%d", i), string.format("%dgt", i), { desc = string.format("[T]ab %d", i) })
 end
 
 -- Buffer Management
-remap.nmap("<Leader>bl", ":ls<CR>", { desc = "[B]uffer [L]ist" })
-remap.nmap("<Leader>bd", ":bdelete<CR>", { desc = "[B]uffer [D]elete" })
-remap.nmap("]b", ":bnext<CR>", { desc = "[B]uffer [N]ext" })
-remap.nmap("[b", ":bprevious<CR>", { desc = "[B]uffer [P]revious" })
-remap.nmap("<Leader>bb", ":b<Space>", { desc = "[B]uffer Select" })
-remap.nmap("<Leader>bo", ":bufdo bd|1bd<CR>", { desc = "[B]uffer Delete Others" })
+nmap("<Leader>bl", ":ls<CR>", { desc = "[B]uffer [L]ist" })
+nmap("<Leader>bd", ":bdelete<CR>", { desc = "[B]uffer [D]elete" })
+nmap("]b", ":bnext<CR>", { desc = "[B]uffer [N]ext" })
+nmap("[b", ":bprevious<CR>", { desc = "[B]uffer [P]revious" })
+nmap("<Leader>bb", ":b<Space>", { desc = "[B]uffer Select" })
+nmap("<Leader>bo", ":bufdo bd|1bd<CR>", { desc = "[B]uffer Delete Others" })
 
 -- Terminal
-remap.nmap("<Leader>tet", function()
+nmap("<Leader>tet", function()
 	vim.cmd("terminal")
 	vim.cmd("startinsert")
 end, { desc = "[T]erminal" })
-remap.nmap("<leader>ter", function()
+nmap("<leader>ter", function()
 	local buf_dir = vim.fn.expand("%:p:h")
 	vim.cmd("edit term://" .. buf_dir .. "//zsh")
 	vim.cmd("startinsert")
 end, { desc = "[T]erminal [R]elative" })
-remap.tmap("<Esc>", "<C-\\><C-n>", { desc = "Terminal Normal Mode" })
-remap.tmap("jk", "<C-\\><C-n>", { desc = "Terminal Normal Mode" })
-remap.tmap("<C-w>", "<C-\\><C-n><C-w>", { desc = "Terminal Window Command" })
+tmap("<Esc>", "<C-\\><C-n>", { desc = "Terminal Normal Mode" })
+tmap("jk", "<C-\\><C-n>", { desc = "Terminal Normal Mode" })
+tmap("<C-w>", "<C-\\><C-n><C-w>", { desc = "Terminal Window Command" })