cleanup: (nvim) changed <cmd> and <cr> to uppercase variant. added: spelling bind and source bind

2 files changed, 21 insertions, 13 deletions

diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua
index 15dd320..1fee0e3 100644
--- a/config/essentials/nvim/lua/tlast/remap.lua
+++ b/config/essentials/nvim/lua/tlast/remap.lua
@@ -18,9 +18,9 @@ vim.keymap.set("i", "{<CR>", "{<CR>}<C-o>O")
 vim.keymap.set("i", "{;<CR>", "{<CR>};<C-o>O")
 
 -- buffers
-vim.keymap.set("n", "gb", "<cmd>buffers<CR>:buffer<Space>")
-vim.keymap.set("n", "<leader>q", "<cmd>q!<CR>")
-vim.keymap.set("n", "<leader>Q", "<cmd>qa!<CR>")
+vim.keymap.set("n", "gb", "<CMD>buffers<CR>:buffer<Space>")
+vim.keymap.set("n", "<Leader>q", "<CMD>q!<CR>")
+vim.keymap.set("n", "<Leader>Q", "<CMD>qa!<CR>")
 
 -- Windows
 vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-h>", "<C-W>h")
@@ -30,24 +30,25 @@ vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-l>", "<C-W>l")
 vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-o>", "<C-W>o")
 
 -- move visual selection up/down wards
-vim.keymap.set("v", "J",  "<cmd>m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", "<cmd>m '<-2<CR>gv=gv")
+vim.keymap.set("v", "J",  "<CMD>m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", "<CMD>m '<-2<CR>gv=gv")
 
 -- Don't move!
 vim.keymap.set("n", "J", "mzJ`z")
 
 -- clipboard
-vim.keymap.set("n", "<leader>y", "\"+y")
-vim.keymap.set("n", "<leader>o", "<Plug>OSCYank")
+vim.keymap.set("n", "<Leader>y", "\"+y")
+vim.keymap.set("n", "<Leader>o", "<Plug>OSCYank")
 
 -- scripts
-vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true})
+vim.keymap.set("n", "<Leader>x", "<CMD>!chmod +x %<CR>", { silent = true})
 
 -- replace
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<Leader>rf", [[:%s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<Leader>rl", [[:s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
 
 -- templates
-vim.keymap.set("n", "<leader>rt", ":r " .. vim.fn.stdpath("config") .. "/templates/")
+vim.keymap.set("n", "<Leader>rt", ":r " .. vim.fn.stdpath("config") .. "/templates/")
 
 -- hide all
 local s = {hidden_all = 0}
@@ -64,8 +65,13 @@ vim.keymap.set("n", "<C-h>", function ()
 end)
 
 -- random
-vim.keymap.set("i", "<LocalLeader>r", "<cmd>r!echo -n $RANDOM<cr><esc>kJA")
+vim.keymap.set("i", "<LocalLeader>r", "<CMD>r!echo -n $RANDOM<CR><esc>kJA")
 
 -- write
-vim.keymap.set("n", "<LocalLeader>w", "<cmd>write<CR>")
-vim.keymap.set("n", "<LocalLeader>W", "<cmd>write!<CR>")
+vim.keymap.set("n", "<LocalLeader>w", "<CMD>write<CR>")
+vim.keymap.set("n", "<LocalLeader>W", "<CMD>write!<CR>")
+vim.keymap.set("n", "<LocalLeader>e", "<CMD>edit<CR><CMD>set nohls<CR>")
+vim.keymap.set("n", "<Leader><M-s>", "<CMD>source<CR>")
+
+-- spelling
+vim.keymap.set("n", "<Leader><C-s>", "<CMD>setlocal spell!<CR>")
diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua
index ab582bb..9ab659f 100644
--- a/config/essentials/nvim/lua/tlast/set.lua
+++ b/config/essentials/nvim/lua/tlast/set.lua
@@ -34,3 +34,5 @@ vim.opt.smartcase = true
 
 vim.opt.swapfile = false
 vim.opt.backup = false
+
+vim.opt.spelllang = "en_us"