From b41db4f6222aaced36f8cb9c1bdb566cc15c81fd Mon Sep 17 00:00:00 2001
From: mequidis <that2tl@gmail.com>
Date: Sun, 29 May 2022 11:06:01 +0300
Subject: [PATCH] nvim: ":" -> "<cmd>" in mappings

---
 .config/nvim/lua/mappings.lua    | 84 ++++++++++++++++----------------
 .config/nvim/lua/plugins/lsp.lua |  1 +
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index fe73203..825b8a7 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -18,55 +18,55 @@ vim.keymap.set("n", "<C-J>", "o<Esc>")
 vim.keymap.set("n", "<C-K>", "O<Esc>")
 
 -- movement
-vim.keymap.set("n", "<leader>h", ":wincmd h<cr>")
-vim.keymap.set("n", "<leader>j", ":wincmd j<cr>")
-vim.keymap.set("n", "<leader>k", ":wincmd k<cr>")
-vim.keymap.set("n", "<leader>l", ":wincmd l<cr>")
+vim.keymap.set("n", "<leader>h", "<cmd>wincmd h<CR>")
+vim.keymap.set("n", "<leader>j", "<cmd>wincmd j<CR>")
+vim.keymap.set("n", "<leader>k", "<cmd>wincmd k<CR>")
+vim.keymap.set("n", "<leader>l", "<cmd>wincmd l<CR>")
 
 -- splits and buffers
-vim.keymap.set("n", "<leader>sv", ":vsplit<CR>")
-vim.keymap.set("n", "<leader>sz", ":split<CR>")
-vim.keymap.set("n", "<leader>st", ":tabnew<CR>")
-vim.keymap.set("n", "<leader>sb", ":Telescope buffers<CR>")
-vim.keymap.set("n", "<leader>sh", ":tabprevious<cr>")
-vim.keymap.set("n", "<leader>sl", ":tabnext<cr>")
+vim.keymap.set("n", "<leader>sv", "<cmd>vsplit<CR>")
+vim.keymap.set("n", "<leader>sz", "<cmd>split<CR>")
+vim.keymap.set("n", "<leader>st", "<cmd>tabnew<CR>")
+vim.keymap.set("n", "<leader>sb", "<cmd>Telescope buffers<CR>")
+vim.keymap.set("n", "<leader>sh", "<cmd>tabprevious<CR>")
+vim.keymap.set("n", "<leader>sl", "<cmd>tabnext<CR>")
 
 -- basics
-vim.keymap.set("n", "<leader>q", ":q<CR>")
-vim.keymap.set("n", "<leader>Q", ":qa<CR>")
-vim.keymap.set("n", "<leader>x", ":q!<CR>")
-vim.keymap.set("n", "<leader>X", ":qa!<CR>")
-vim.keymap.set("n", "<leader>w", ":w<CR>")
-vim.keymap.set("n", "<leader>W", ":wa<CR>")
-vim.keymap.set("n", "<leader>f", ":NvimTreeToggle<CR>")
-vim.keymap.set("n", "<leader>F", ":Telescope find_files<CR>")
+vim.keymap.set("n", "<leader>q", "<cmd>q<CR>")
+vim.keymap.set("n", "<leader>Q", "<cmd>qa<CR>")
+vim.keymap.set("n", "<leader>x", "<cmd>q!<CR>")
+vim.keymap.set("n", "<leader>X", "<cmd>qa!<CR>")
+vim.keymap.set("n", "<leader>w", "<cmd>w<CR>")
+vim.keymap.set("n", "<leader>W", "<cmd>wa<CR>")
+vim.keymap.set("n", "<leader>f", "<cmd>NvimTreeToggle<CR>")
+vim.keymap.set("n", "<leader>F", "<cmd>Telescope find_files<CR>")
 
 -- toggle term
-vim.keymap.set("n", "<leader>c", ":ToggleTermToggleAll<CR>")
-vim.keymap.set("n", "<leader>C", ":ToggleTerm<CR>")
+vim.keymap.set("n", "<leader>c", "<cmd>ToggleTermToggleAll<CR>")
+vim.keymap.set("n", "<leader>C", "<cmd>ToggleTerm<CR>")
 
 -- frequent actions
-vim.keymap.set("n", "<leader>ar", ":source ~/.config/nvim/init.lua<CR>")
-vim.keymap.set("n", "<leader>ac", ":Telescope find_files cwd=~/.config/nvim<CR>")
+vim.keymap.set("n", "<leader>ar", "<cmd>source ~/.config/nvim/init.lua<CR>")
+vim.keymap.set("n", "<leader>ac", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>")
 
 -- keymap switches
-vim.keymap.set("i", "<C-x>", "<Esc>:set keymap=<CR>a")
-vim.keymap.set("i", "<C-z>", "<Esc>:set keymap=hebrew<CR>a")
+vim.keymap.set("i", "<C-x>", "<Esc><cmd>set keymap=<CR>a")
+vim.keymap.set("i", "<C-z>", "<Esc><cmd>set keymap=hebrew<CR>a")
 
 -- telescope
-vim.keymap.set("n", "<leader>tt", ":Telescope<CR>")
-vim.keymap.set("n", "<leader>tl", ":Telescope lsp_dynamic_workspace_symbols<CR>")
-vim.keymap.set("n", "<leader>to", ":Telescope oldfiles<CR>")
-vim.keymap.set("n", "<leader>tg", ":Telescope live_grep<CR>")
-vim.keymap.set("n", "<leader>ts", ":Telescope treesitter<CR>")
+vim.keymap.set("n", "<leader>tt", "<cmd>Telescope<CR>")
+vim.keymap.set("n", "<leader>tl", "<cmd>Telescope lsp_dynamic_workspace_symbols<CR>")
+vim.keymap.set("n", "<leader>to", "<cmd>Telescope oldfiles<CR>")
+vim.keymap.set("n", "<leader>tg", "<cmd>Telescope live_grep<CR>")
+vim.keymap.set("n", "<leader>ts", "<cmd>Telescope treesitter<CR>")
 
 -- code
-vim.keymap.set("n", "<leader>gf", ":Neoformat<CR>")
-vim.keymap.set("n", "<leader>gd", ":Telescope lsp_definitions<CR>")
-vim.keymap.set("n", "<leader>gi", ":Telescope lsp_implementations<CR>")
-vim.keymap.set("n", "<leader>gr", ":Telescope lsp_references<CR>")
-vim.keymap.set("n", "<leader>ga", ":Telescope lsp_code_actions<CR>")
-vim.keymap.set("n", "<leader>gq", ":Telescope diagnostics<CR>")
+vim.keymap.set("n", "<leader>gf", "<cmd>Neoformat<CR>")
+vim.keymap.set("n", "<leader>gd", "<cmd>Telescope lsp_definitions<CR>")
+vim.keymap.set("n", "<leader>gi", "<cmd>Telescope lsp_implementations<CR>")
+vim.keymap.set("n", "<leader>gr", "<cmd>Telescope lsp_references<CR>")
+vim.keymap.set("n", "<leader>ga", "<cmd>Telescope lsp_code_actions<CR>")
+vim.keymap.set("n", "<leader>gq", "<cmd>Telescope diagnostics<CR>")
 vim.keymap.set("n", "<leader>gD", function()
 	vim.lsp.buf.declaration()
 end)
@@ -114,12 +114,12 @@ end)
 vim.keymap.set("n", "<leader>du", function()
 	require("dapui").toggle()
 end)
-vim.keymap.set("n", "<leader>dv", ":Telescope dap variables<CR>")
-vim.keymap.set("n", "<leader>dh", ":Telescope dap commands<CR>")
-vim.keymap.set("n", "<leader>dp", ":Telescope dap list_breakpoints<CR>")
+vim.keymap.set("n", "<leader>dv", "<cmd>Telescope dap variables<CR>")
+vim.keymap.set("n", "<leader>dh", "<cmd>Telescope dap commands<CR>")
+vim.keymap.set("n", "<leader>dp", "<cmd>Telescope dap list_breakpoints<CR>")
 
 -- git
-vim.keymap.set("n", "<leader>vs", ":Git<CR>")
-vim.keymap.set("n", "<leader>vb", ":Telescope git_branches<CR>")
-vim.keymap.set("n", "<leader>vc", ":Telescope git_commits<CR>")
-vim.keymap.set("n", "<leader>vf", ":Telescope git_files<CR>")
+vim.keymap.set("n", "<leader>vs", "<cmd>Git<CR>")
+vim.keymap.set("n", "<leader>vb", "<cmd>Telescope git_branches<CR>")
+vim.keymap.set("n", "<leader>vc", "<cmd>Telescope git_commits<CR>")
+vim.keymap.set("n", "<leader>vf", "<cmd>Telescope git_files<CR>")
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 3fd673c..e3d482a 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -10,6 +10,7 @@ lsp.pyright.setup({
 		},
 	},
 })
+-- lsp.pylsp.setup({})
 lsp.gopls.setup({})
 lsp.clangd.setup({})
 lsp.texlab.setup({})