diff --git a/init.lua b/init.lua
index fd8842f2..5cc7fe16 100644
--- a/init.lua
+++ b/init.lua
@@ -176,7 +176,7 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
 --
 -- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
 -- or just use <C-\><C-n> to exit terminal mode
-vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
+vim.keymap.set('t', '<Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
 
 -- TIP: Disable arrow keys in normal mode
 -- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
@@ -524,8 +524,8 @@ require('lazy').setup({
   --
   require 'kickstart.plugins.debug',
   require 'kickstart.plugins.indent_line',
-  -- require 'kickstart.plugins.lint',
-  -- require 'kickstart.plugins.autopairs',
+  require 'kickstart.plugins.lint',
+  require 'kickstart.plugins.autopairs',
   require 'kickstart.plugins.neo-tree',
   require 'custom.plugins.autocomplete',
   require 'custom.plugins.autoformat',
@@ -566,3 +566,9 @@ require('lazy').setup({
 })
 
 require 'custom'
+
+vim.api.nvim_create_autocmd('VimEnter', {
+  callback = function()
+    vim.cmd 'Trouble'
+  end,
+})
diff --git a/lua/custom/plugins/lsp.lua b/lua/custom/plugins/lsp.lua
index 6af93a8a..fd18d5f6 100644
--- a/lua/custom/plugins/lsp.lua
+++ b/lua/custom/plugins/lsp.lua
@@ -147,9 +147,13 @@ return { -- LSP Configuration & Plugins
       clangd = {
         cmd = {
           'clangd',
-          '--offset-encoding=UTF-8',
+          '--query-driver=/bin/clang-tidy,/usr/bin/**/clang-*,/bin/clang,/bin/clang++,/usr/bin/gcc,/usr/bin/g++',
+          '--clang-tidy',
+          '--clang-tidy-checks=*',
           '--style=file ~/.config/nvim/clang-format',
+          '--background-index',
         },
+        capabilities = capabilities,
       },
       -- gopls = {},
       pyright = {},
@@ -199,6 +203,7 @@ return { -- LSP Configuration & Plugins
     local ensure_installed = vim.tbl_keys(servers or {})
     vim.list_extend(ensure_installed, {
       'stylua', -- Used to format Lua code
+      'cpplint',
       'clangd',
       'clang-format',
       'codelldb',
diff --git a/lua/custom/plugins/toggleterm.lua b/lua/custom/plugins/toggleterm.lua
index 65820018..a1ba751f 100644
--- a/lua/custom/plugins/toggleterm.lua
+++ b/lua/custom/plugins/toggleterm.lua
@@ -2,6 +2,16 @@ return {
   'akinsho/toggleterm.nvim',
   version = '*',
   config = true,
+  init = function()
+    local opts = { buffer = 0 }
+    vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+    vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
+    vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+    vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+    vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+    vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+    vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
+  end,
   keys = {
     {
       '<leader>to',
@@ -10,7 +20,8 @@ return {
     },
     {
       '<A-i>',
-      '<Cmd>ToggleTermToggle<CR>',
+      '<Cmd>ToggleTerm<CR>',
+      mode = { 'n', 't' },
     },
     {
       '<leader>tt',
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 20f676b4..355325e3 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -90,6 +90,6 @@ return {
 
     -- Install golang specific config
     require('dap-go').setup()
-    require('dap-python').setup()
+    require('dap-python').setup '~/.config/nvim/.venv/bin/python'
   end,
 }
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index 533550e9..b55ece4d 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -6,13 +6,10 @@ return {
     config = function()
       local lint = require 'lint'
       lint.linters_by_ft = {
-        markdown = { 'markdownlint' },
         python = { 'mypy', 'ruff' },
-        yaml = { 'yamllint' },
         cmake = { 'cmakelint' },
         cpp = { 'cppcheck' },
         c = { 'cppcheck' },
-        json = { 'jsonlint' },
         javascript = { 'eslint' },
         css = { 'stylelint' },
         html = { 'tidy' },
diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua
index 978d35fa..89739543 100644
--- a/lua/kickstart/plugins/neo-tree.lua
+++ b/lua/kickstart/plugins/neo-tree.lua
@@ -13,6 +13,7 @@ return {
   keys = {
     { '<C-e>', ':Neotree toggle<CR>', { desc = 'NeoTree toggle' } },
     { '<leader>e', ':Neotree reveal<CR>', mode = '', desc = '[E]xplore files' },
+    { '<leader>E', ':Neotree buffers<CR>', mode = '', desc = '[E]xplore buffers' },
   },
   opts = {
     filesystem = {
diff --git a/setup.sh b/setup.sh
index c6405768..ab842142 100755
--- a/setup.sh
+++ b/setup.sh
@@ -5,7 +5,7 @@ python3 -m venv .venv
 .venv/bin/pip install debugpy
 
 # Install dependencies
-PKGS=("clang" "cmake" "npm")
+PKGS=("cppcheck" "clang" "cmake" "npm")
 
 # Get distro
 distro=$(cat /etc/os-release | grep PRETTY_NAME= | awk '{print $1}' | cut -d \" -f 2)