From 45c537c675fe15d06bfb8e460de4019c85cb4fec Mon Sep 17 00:00:00 2001
From: SinTan1729 <sayantan.santra689@gmail.com>
Date: Wed, 20 Mar 2024 20:48:32 -0500
Subject: [PATCH] chg: Move almost every setting to lua

---
 laptop/init.lua    |  2 +-
 laptop/keymaps.lua | 35 +++++++++++++++++++++++++++++++++++
 laptop/keymaps.vim | 36 ------------------------------------
 server/init.lua    |  2 +-
 server/keymaps.lua | 23 +++++++++++++++++++++++
 server/keymaps.vim | 21 ---------------------
 vps/init.lua       |  2 +-
 vps/keymaps.lua    | 22 ++++++++++++++++++++++
 vps/keymaps.vim    | 17 -----------------
 9 files changed, 83 insertions(+), 77 deletions(-)
 create mode 100644 laptop/keymaps.lua
 delete mode 100644 laptop/keymaps.vim
 create mode 100644 server/keymaps.lua
 delete mode 100644 server/keymaps.vim
 create mode 100644 vps/keymaps.lua
 delete mode 100644 vps/keymaps.vim

diff --git a/laptop/init.lua b/laptop/init.lua
index 83cf54a..403e54e 100644
--- a/laptop/init.lua
+++ b/laptop/init.lua
@@ -33,7 +33,7 @@ vim.g.loaded_ruby_provider = 0
 vim.g.UltiSnipsSnippetDirectories = { "custom-snippets", "UltiSnips" }
 
 -- Load keymaps
-local keymaps = vim.fn.stdpath("config") .. "/keymaps.vim"
+local keymaps = vim.fn.stdpath("config") .. "/keymaps.lua"
 vim.cmd.source(keymaps)
 
 -- Load plugins using paq-nvim
diff --git a/laptop/keymaps.lua b/laptop/keymaps.lua
new file mode 100644
index 0000000..b1eba34
--- /dev/null
+++ b/laptop/keymaps.lua
@@ -0,0 +1,35 @@
+-- This file lists all the global keymaps
+
+-- Change the leader and localleader
+vim.g.mapleader = ','
+vim.g.maplocalleader = ';'
+
+-- Set K to hover
+vim.cmd[[command -nargs=+ LspHover lua vim.lsp.buf.hover()]]
+vim.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 })
+
+-- 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 })
+
+-- 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 })
+
+-- Use ,u for redo
+vim.keymap.set('n', '<leader>u', "<c-r>", { remap = false })
+
+-- Find files using fzf by ,f
+vim.keymap.set('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 })
+
diff --git a/laptop/keymaps.vim b/laptop/keymaps.vim
deleted file mode 100644
index 90f50c1..0000000
--- a/laptop/keymaps.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" This file lists all the global keymaps
-
-" Set K to hover
-command -nargs=+ LspHover lua vim.lsp.buf.hover()
-set keywordprg=:LspHover
-
-" Use ctrl-[hjkl] to select the active split!
-nmap <silent> <c-k> :wincmd k<CR>
-nmap <silent> <c-j> :wincmd j<CR>
-nmap <silent> <c-h> :wincmd h<CR>
-nmap <silent> <c-l> :wincmd l<CR>
-
-" Change the leader and localleader
-let mapleader=","
-let maplocalleader=';'
-
-" Use ,dd for deleting without putting into buffer
-nnoremap <leader>d "_d
-nnoremap <leader>D "_D
-nnoremap <leader>x "_x
-vnoremap <leader>d "_d
-
-" Insert a newline in normal mode by ,o
-nnoremap <leader>o o<Esc>k
-nnoremap <leader>O O<Esc>j
-
-" Use ,u for redo
-nnoremap <leader>u <c-r>
-
-" Find files using fzf by ,f
-nnoremap <leader>f :Files<CR>
-
-" Move around buffers using ,j and ,k
-nnoremap <leader>k :bnext<CR>
-nnoremap <leader>k :bprevious<CR>
-
diff --git a/server/init.lua b/server/init.lua
index 8ff084c..4c75f54 100644
--- a/server/init.lua
+++ b/server/init.lua
@@ -27,7 +27,7 @@ vim.g.loaded_node_provider = 0
 vim.g.loaded_ruby_provider = 0
 
 -- Load keymaps
-local keymaps = vim.fn.stdpath("config") .. "/keymaps.vim"
+local keymaps = vim.fn.stdpath("config") .. "/keymaps.lua"
 vim.cmd.source(keymaps)
 
 -- Load plugins using paq-nvim
diff --git a/server/keymaps.lua b/server/keymaps.lua
new file mode 100644
index 0000000..4081b9c
--- /dev/null
+++ b/server/keymaps.lua
@@ -0,0 +1,23 @@
+-- This file lists all the global keymaps
+
+-- Change the leader and localleader
+vim.g.mapleader = ','
+vim.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 })
+
+-- 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 })
+
+-- Use ,u for redo
+vim.keymap.set('n', '<leader>u', "<c-r>", { 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 })
+
diff --git a/server/keymaps.vim b/server/keymaps.vim
deleted file mode 100644
index 9cca56f..0000000
--- a/server/keymaps.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-" Change the leader to a comma
-let mapleader = ","
-let g:mapleader = ","
-
-" Use ,dd for deleting without putting into buffer
-nnoremap <leader>d "_d
-nnoremap <leader>D "_D
-nnoremap <leader>x "_x
-vnoremap <leader>d "_d
-
-" Insert a newline in normal mode by ,o
-nnoremap <Leader>o o<Esc>k
-nnoremap <Leader>O O<Esc>j
-
-" Use ,u for redo
-nnoremap <Leader>u <c-r>
-
-" Move around buffers using ,j and ,k
-nnoremap <leader>k :bnext<CR>
-nnoremap <leader>k :bprevious<CR>
-
diff --git a/vps/init.lua b/vps/init.lua
index 8ff084c..4c75f54 100644
--- a/vps/init.lua
+++ b/vps/init.lua
@@ -27,7 +27,7 @@ vim.g.loaded_node_provider = 0
 vim.g.loaded_ruby_provider = 0
 
 -- Load keymaps
-local keymaps = vim.fn.stdpath("config") .. "/keymaps.vim"
+local keymaps = vim.fn.stdpath("config") .. "/keymaps.lua"
 vim.cmd.source(keymaps)
 
 -- Load plugins using paq-nvim
diff --git a/vps/keymaps.lua b/vps/keymaps.lua
new file mode 100644
index 0000000..6b165f7
--- /dev/null
+++ b/vps/keymaps.lua
@@ -0,0 +1,22 @@
+-- This file lists all the global keymaps
+
+-- Change the leader and localleader
+vim.g.mapleader = ','
+vim.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 })
+
+-- 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 })
+
+-- Use ,u for redo
+vim.keymap.set('n', '<leader>u', "<c-r>", { 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 })
+
diff --git a/vps/keymaps.vim b/vps/keymaps.vim
deleted file mode 100644
index d5db0f3..0000000
--- a/vps/keymaps.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Change the leader to a comma
-let mapleader = ","
-let g:mapleader = ","
-
-" Use ,dd for deleting without putting into buffer
-nnoremap <leader>d "_d
-nnoremap <leader>D "_D
-nnoremap <leader>x "_x
-vnoremap <leader>d "_d
-
-" Insert a newline in normal mode by ,o
-nnoremap <Leader>o o<Esc>k
-nnoremap <Leader>O O<Esc>j
-
-" Use ,u for redo
-nnoremap <Leader>u <c-r>
-