diff --git a/lua/custom/plugins/cmake-tools.lua b/lua/custom/plugins/cmake-tools.lua
index 7964cf7c..161b3556 100644
--- a/lua/custom/plugins/cmake-tools.lua
+++ b/lua/custom/plugins/cmake-tools.lua
@@ -2,5 +2,11 @@ return {
   'Civitasv/cmake-tools.nvim',
   config = function()
     require('cmake-tools').setup {}
+
+    vim.keymap.set('n', '<leader>mb', ':CMakeBuild<CR>')
+    vim.keymap.set('n', '<leader>mr', ':CMakeRun<CR>')
+
+    vim.keymap.set('n', '<leader>mmb', ':CMakeBuildCurrentFile<CR>')
+    vim.keymap.set('n', '<leader>mmr', ':CMakeRunCurrentFile<CR>')
   end,
 }
diff --git a/lua/remap.lua b/lua/remap.lua
index 52a7e963..c8566478 100644
--- a/lua/remap.lua
+++ b/lua/remap.lua
@@ -1,8 +1,6 @@
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
 
-vim.keymap.set('i', 'jj', '<Esc>')
-
 -- clear higlight on search on pressing <Esc> in normal mode
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')