diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 66b50d71..c77dc1c0 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -91,6 +91,7 @@ vim.g.coq_settings = {
 }
 -- vim.g.rooter_manual_only = 1
 vim.g.copilot_node_command = "~/.local/share/nvm/v16.18.1/bin/node"
+vim.g.copilot_no_tab_map = true
 
 require('keymaps')
 require('plugins')
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 16711740..c3daadd1 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -87,8 +87,8 @@ local normal_mode_maps = {
 
 local insert_mode_maps = {
     { key = '<C-j>', map = '<ESC>' },
-    { key = "<C-l>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
-    { key = "<C-m>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
+    -- { key = "<C-l>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
+    -- { key = "<C-m>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
     { key = '<C-c>', map = [[<cmd>Telescope commands<cr>]] },
 }
 
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 92db6a4b..8cf1e847 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -28,10 +28,10 @@ return require('lazy').setup({
     { 'tpope/vim-fugitive',    cmd = { "Git", "Gdiffsplit", "Gvdiffsplit", "Gedit", "Gread", "Gwrite", "Ggrep", "Gbrowse", "GMove", "GDelete" } },
     'tpope/vim-repeat',
     'tpope/vim-speeddating',
-    'tpope/vim-surround',
+    { 'tpope/vim-surround',            lazy = false },
     'tpope/vim-vinegar',
     'tpope/vim-abolish',
-    { 'yuttie/comfortable-motion.vim', lazy = "BufEnter" },
+    { 'yuttie/comfortable-motion.vim', event = "BufEnter" },
     -- 'ruanyl/vim-gh-line',
     { 'rest-nvim/rest.nvim',           event = "BufEnter" },
     -- 'b0o/SchemaStore.nvim',
@@ -166,11 +166,11 @@ return require('lazy').setup({
         end,
     },
     { 'neovim/nvim-lspconfig',
-        ft = { "rust", "toml", "lua" },
+        ft = { "rust", "toml", "lua", "c", "cpp", "markdown" },
         config = function()
-            require(
-                "lsp")
-        end, },
+            require("lsp")
+        end
+    },
     {
         'nvim-lua/lsp-status.nvim',
         event = "LspAttach"