From 2cc1fc0fb5dd85f4b5cf0567f21c1470ecf29234 Mon Sep 17 00:00:00 2001
From: SinTan1729 <sayantan.santra689@gmail.com>
Date: Tue, 26 Mar 2024 22:44:37 -0500
Subject: [PATCH] new: Clear search highlight by Esc in normal mode

---
 laptop/config/globals.lua |  8 ++++----
 laptop/config/keymaps.lua | 41 +++++++++++++++++++++++----------------
 server/config/globals.lua |  7 ++++---
 server/config/keymaps.lua | 27 +++++++++++++++-----------
 vps/config/globals.lua    |  7 ++++---
 vps/config/keymaps.lua    | 27 +++++++++++++++-----------
 6 files changed, 68 insertions(+), 49 deletions(-)

diff --git a/laptop/config/globals.lua b/laptop/config/globals.lua
index d66f428..e18790f 100644
--- a/laptop/config/globals.lua
+++ b/laptop/config/globals.lua
@@ -1,5 +1,6 @@
 -- This file defines all the global config
 local set = vim.opt
+local g = vim.g
 
 -- Turn on numbers
 set.number = true
@@ -23,9 +24,8 @@ set.spell = true
 set.mouse = 'n'
 -- Enable programming dictionary
 set.spelllang = { "en", "programming" }
--- Use ctrl-[hjkl] to select the active split
 
 -- Disable unused plugins
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_node_provider = 0
-vim.g.loaded_ruby_provider = 0
+g.loaded_perl_provider = 0
+g.loaded_node_provider = 0
+g.loaded_ruby_provider = 0
diff --git a/laptop/config/keymaps.lua b/laptop/config/keymaps.lua
index 12d724c..3db447c 100644
--- a/laptop/config/keymaps.lua
+++ b/laptop/config/keymaps.lua
@@ -1,34 +1,41 @@
 -- This file lists all the global keymaps
+local map = vim.keymap.set
+local g = vim.g
+local api = vim.api
+local opt = vim.opt
 
 -- Change the leader and localleader
-vim.g.mapleader = ','
-vim.g.maplocalleader = ';'
+g.mapleader = ','
+g.maplocalleader = ';'
 
 -- Set K to hover
-vim.api.nvim_buf_create_user_command(0, "LspHover", "lua vim.lsp.buf.hover()", { nargs = '+' })
-vim.opt.keywordprg = ":LspHover"
+api.nvim_buf_create_user_command(0, "LspHover", "lua vim.lsp.buf.hover()", { nargs = '+' })
+opt.keywordprg = ":LspHover"
 
 -- Use ctrl-[hjkl] to select the active split!
-vim.keymap.set('n', '<c-k>', ":wincmd k<cr>", { silent = true })
-vim.keymap.set('n', '<c-j>', ":wincmd j<cr>", { silent = true })
-vim.keymap.set('n', '<c-h>', ":wincmd h<cr>", { silent = true })
-vim.keymap.set('n', '<c-l>', ":wincmd l<cr>", { silent = true })
+map('n', '<c-k>', ":wincmd k<cr>", { silent = true })
+map('n', '<c-j>', ":wincmd j<cr>", { silent = true })
+map('n', '<c-h>', ":wincmd h<cr>", { silent = true })
+map('n', '<c-l>', ":wincmd l<cr>", { silent = true })
 
 -- Use ,dd for deleting without putting into buffer
-vim.keymap.set({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
-vim.keymap.set('n', '<leader>D', '"_D', { remap = false })
-vim.keymap.set('n', '<leader>x', '"_x', { remap = false })
+map({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
+map('n', '<leader>D', '"_D', { remap = false })
+map('n', '<leader>x', '"_x', { remap = false })
 
 -- Insert a newline in normal mode by ,o
-vim.keymap.set('n', '<leader>o', "o<Esc>k", { remap = false })
-vim.keymap.set('n', '<leader>O', "O<Esc>j", { remap = false })
+map('n', '<leader>o', "o<Esc>k", { remap = false })
+map('n', '<leader>O', "O<Esc>j", { remap = false })
 
 -- Use ,u for redo
-vim.keymap.set('n', '<leader>u', "<c-r>", { remap = false })
+map('n', '<leader>u', "<c-r>", { remap = false })
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ":Files<cr>", { remap = false })
+map('n', '<leader>f', ":Files<cr>", { remap = false })
 
 -- Move around buffers using ,j and ,k
-vim.keymap.set('n', '<leader>k', ":bnext<cr>", { remap = false })
-vim.keymap.set('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>k', ":bnext<cr>", { remap = false })
+map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+
+-- Clear search highlight by Esc in normal mode
+map('n', '<Esc>', ':noh<cr>', { remap = false })
diff --git a/server/config/globals.lua b/server/config/globals.lua
index e8d237c..ff908ee 100644
--- a/server/config/globals.lua
+++ b/server/config/globals.lua
@@ -1,5 +1,6 @@
 -- This file defines all the global configs
 local set = vim.opt
+local g = vim.g
 
 -- Turn on numbers
 set.number = true
@@ -23,7 +24,7 @@ set.mouse = 'n'
 set.spelllang = { "en", "programming" }
 
 -- Disable unused plugins
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_node_provider = 0
-vim.g.loaded_ruby_provider = 0
+g.loaded_perl_provider = 0
+g.loaded_node_provider = 0
+g.loaded_ruby_provider = 0
 
diff --git a/server/config/keymaps.lua b/server/config/keymaps.lua
index 448bfec..9cc2958 100644
--- a/server/config/keymaps.lua
+++ b/server/config/keymaps.lua
@@ -1,27 +1,32 @@
 -- This file lists all the global keymaps
+local map = vim.keymap.set
+local g = vim.g
 
 -- Change the leader and localleader
-vim.g.mapleader = ','
-vim.g.maplocalleader = ';'
+g.mapleader = ','
+g.maplocalleader = ';'
 
 
 -- Use ,dd for deleting without putting into buffer
-vim.keymap.set({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
-vim.keymap.set('n', '<leader>D', '"_D', { remap = false })
-vim.keymap.set('n', '<leader>x', '"_x', { remap = false })
+map({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
+map('n', '<leader>D', '"_D', { remap = false })
+map('n', '<leader>x', '"_x', { remap = false })
 
 -- Insert a newline in normal mode by ,o
-vim.keymap.set('n', '<leader>o', "o<Esc>k", { remap = false })
-vim.keymap.set('n', '<leader>O', "O<Esc>j", { remap = false })
+map('n', '<leader>o', "o<Esc>k", { remap = false })
+map('n', '<leader>O', "O<Esc>j", { remap = false })
 
 -- Use ,u for redo
-vim.keymap.set('n', '<leader>u', "<c-r>", { remap = false })
+map('n', '<leader>u', "<c-r>", { remap = false })
 
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ":Files<cr>", { remap = false })
+map('n', '<leader>f', ":Files<cr>", { remap = false })
 
 -- Move around buffers using ,j and ,k
-vim.keymap.set('n', '<leader>k', ":bnext<cr>", { remap = false })
-vim.keymap.set('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>k', ":bnext<cr>", { remap = false })
+map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+
+-- Clear search highlight by Esc in normal mode
+map('n', '<Esc>', ':noh<cr>', { remap = false })
 
diff --git a/vps/config/globals.lua b/vps/config/globals.lua
index e8d237c..ff908ee 100644
--- a/vps/config/globals.lua
+++ b/vps/config/globals.lua
@@ -1,5 +1,6 @@
 -- This file defines all the global configs
 local set = vim.opt
+local g = vim.g
 
 -- Turn on numbers
 set.number = true
@@ -23,7 +24,7 @@ set.mouse = 'n'
 set.spelllang = { "en", "programming" }
 
 -- Disable unused plugins
-vim.g.loaded_perl_provider = 0
-vim.g.loaded_node_provider = 0
-vim.g.loaded_ruby_provider = 0
+g.loaded_perl_provider = 0
+g.loaded_node_provider = 0
+g.loaded_ruby_provider = 0
 
diff --git a/vps/config/keymaps.lua b/vps/config/keymaps.lua
index 59150d5..3430eda 100644
--- a/vps/config/keymaps.lua
+++ b/vps/config/keymaps.lua
@@ -1,25 +1,30 @@
 -- This file lists all the global keymaps
+local map = vim.keymap.set
+local g = vim.g
 
 -- Change the leader and localleader
-vim.g.mapleader = ','
-vim.g.maplocalleader = ';'
+g.mapleader = ','
+g.maplocalleader = ';'
 
 -- Use ,dd for deleting without putting into buffer
-vim.keymap.set({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
-vim.keymap.set('n', '<leader>D', '"_D', { remap = false })
-vim.keymap.set('n', '<leader>x', '"_x', { remap = false })
+map({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
+map('n', '<leader>D', '"_D', { remap = false })
+map('n', '<leader>x', '"_x', { remap = false })
 
 -- Insert a newline in normal mode by ,o
-vim.keymap.set('n', '<leader>o', "o<Esc>k", { remap = false })
-vim.keymap.set('n', '<leader>O', "O<Esc>j", { remap = false })
+map('n', '<leader>o', "o<Esc>k", { remap = false })
+map('n', '<leader>O', "O<Esc>j", { remap = false })
 
 -- Use ,u for redo
-vim.keymap.set('n', '<leader>u', "<c-r>", { remap = false })
+map('n', '<leader>u', "<c-r>", { remap = false })
 
 -- Find files using fzf by ,f
-vim.keymap.set('n', '<leader>f', ":Files<cr>", { remap = false })
+map('n', '<leader>f', ":Files<cr>", { remap = false })
 
 -- Move around buffers using ,j and ,k
-vim.keymap.set('n', '<leader>k', ":bnext<cr>", { remap = false })
-vim.keymap.set('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>k', ":bnext<cr>", { remap = false })
+map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+
+-- Clear search highlight by Esc in normal mode
+map('n', '<Esc>', ':noh<cr>', { remap = false })