diff --git a/lua/keys.lua b/lua/keys.lua
index abb49e0..a6a9918 100644
--- a/lua/keys.lua
+++ b/lua/keys.lua
@@ -3,7 +3,10 @@ vim.api.nvim_set_keymap("n", "<leader>fg", "<cmd>lua require('telescope.builtin'
 vim.api.nvim_set_keymap("n", "<leader>fb", "<cmd>lua require('telescope.builtin').buffers()<cr>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>fh", "<cmd>lua require('telescope.builtin').help_tags()<cr>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>fb", "<cmd>lua require('telescope.builtin').git_branches()<cr>", {silent = true})
-vim.api.nvim_set_keymap("n", "<leader>t", "<CMD>TodoTelescope<CR>", {silent = true})
+vim.api.nvim_set_keymap("n", "<leader>ft", "<CMD>TodoTelescope<CR>", {silent = true})
+vim.api.nvim_set_keymap("n", "gr", "<cmd>lua require('telescope.builtin').lsp_references()<cr>", {silent = true})
+vim.api.nvim_set_keymap("n", "gd", "<cmd>lua require('telescope.builtin').lsp_definitions()<cr>", {silent = true})
+vim.api.nvim_set_keymap("n", "gi", "<cmd>lua require('telescope.builtin').lsp_implementations()<cr>", {silent = true})
 vim.api.nvim_set_keymap("", "q:", "<Nop>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>h", "<Plug>RestNvim", {silent = true})
 
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 80693e5..e94b251 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -296,7 +296,10 @@ return require("packer").startup(
       end
     }
     use {
-      "github/copilot.vim"
+      "github/copilot.vim",
+      config = function()
+        require("plugins/copilot")
+      end
     }
   end
 )
diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua
new file mode 100644
index 0000000..1bf0e7b
--- /dev/null
+++ b/lua/plugins/copilot.lua
@@ -0,0 +1,3 @@
+vim.g.copilot_enabled = true
+-- Map Ctrl-Enter to copilot#Accept
+-- vim.cmd(":Copilot disable")
diff --git a/lua/plugins/formatter.lua b/lua/plugins/formatter.lua
index 7e0241c..ef38eb8 100644
--- a/lua/plugins/formatter.lua
+++ b/lua/plugins/formatter.lua
@@ -36,6 +36,15 @@ require("formatter").setup(
             stdin = true
           }
         end
+      },
+      cpp = {
+        function()
+          return {
+            exe = "clang-format",
+            args = {"'" .. vim.api.nvim_buf_get_name(0) .. "'"},
+            stdin = true
+          }
+        end
       }
     }
   }
@@ -45,7 +54,7 @@ vim.api.nvim_exec(
   [[
 augroup FormatAutogroup
   autocmd!
-  autocmd BufWritePost *.rs,*.lua,*.tsx,*.ts,*.js,*.jsx,*.json FormatWrite
+  autocmd BufWritePost *.h,*.cpp,*.rs,*.lua,*.tsx,*.ts,*.js,*.jsx,*.json FormatWrite
 augroup END
 ]],
   true
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 660cf52..e9b982d 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -18,7 +18,6 @@ vim.fn.sign_define("DiagnosticSignInfo", signHint)
 require("lspkind").init({})
 
 --- Languages
-require "lspconfig".ccls.setup {}
 require "lspconfig".html.setup {}
 require "lspconfig".vimls.setup {}
 require "lspconfig".yamlls.setup {}
@@ -36,9 +35,7 @@ local on_attach = function(client, bufnr)
   -- Mappings.
   local opts = {noremap = true, silent = true}
   buf_set_keymap("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
-  buf_set_keymap("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
   buf_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
-  buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
   buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
   buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
   buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
@@ -46,7 +43,6 @@ local on_attach = function(client, bufnr)
   -- buf_set_keymap("n", "<leader>t", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
   buf_set_keymap("n", "<F2>", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
   buf_set_keymap("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
-  buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
   buf_set_keymap("n", "<leader>d", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", opts)
   buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
   buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)