diff --git a/lua/init.lua b/lua/init.lua
index 20f74cc..237bb17 100644
--- a/lua/init.lua
+++ b/lua/init.lua
@@ -42,15 +42,6 @@ require("mason").setup({
 
 require("mason-lspconfig").setup()
 
-require("mason-lspconfig").setup_handlers {
-  -- The first entry (without a key) will be the default handler
-  -- and will be called for each installed server that doesn't have
-  -- a dedicated handler.
-  function (server_name) -- default handler (optional)
-      require("lspconfig")[server_name].setup {}
-  end
-}
-
 vim.api.nvim_set_keymap("", "<UP>", "<NOP>", {})
 vim.api.nvim_set_keymap("", "<DOWn>", "<NOP>", {})
 vim.api.nvim_set_keymap("", "<LEFT>", "<NOP>", {})
@@ -82,6 +73,63 @@ require('goto-preview').setup {
   vim_ui_input = true, -- Whether to override vim.ui.input with a goto-preview floating window
 }
 
+local has_words_before = function()
+  unpack = unpack or table.unpack
+  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+end
+
+local feedkey = function(key, mode)
+  vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+end
+
+local cmp = require("cmp")
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      vim.fn["vsnip#anonymous"](args.body)
+    end
+  },
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered()
+  },
+  mapping = cmp.mapping.preset.insert({
+    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.abort(),
+    ['<TAB>'] = cmp.mapping(function(fallback) 
+      if cmp.visible() then
+        cmp.confirm({ behaviour = cmp.ConfirmBehavior.Insert, select = true })
+      elseif vim.fn["vsnip#available"](1) == 1 then
+        feedkey("<Plug>(vsnip-expand-or-jump)", "")
+      else
+        fallback()
+      end
+    end, { "i", "s" })
+  }),
+  sources = cmp.config.sources({
+    { name = "nvim_lsp" },
+    { name = "vsnip" },
+  }, {
+    { name = "buffer" }
+  })
+})
+
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
+require("mason-lspconfig").setup_handlers {
+  -- The first entry (without a key) will be the default handler
+  -- and will be called for each installed server that doesn't have
+  -- a dedicated handler.
+  function (server_name) -- default handler (optional)
+    require("lspconfig")[server_name].setup {
+      capabilities = capabilities
+    }
+  end
+}
+
+
 require("nvim-tree").setup({
 	update_focused_file = {
 		enable = true
diff --git a/lua/plugins.lua b/lua/plugins.lua
index a52007a..3579571 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -18,6 +18,13 @@ return {
 	"romgrk/barbar.nvim",
 	"vimsence/vimsence",
 	'hiphish/rainbow-delimiters.nvim',
+	"hrsh7th/cmp-nvim-lsp",
+	"hrsh7th/cmp-buffer",
+	"hrsh7th/cmp-path",
+	"hrsh7th/nvim-cmp",
+	"hrsh7th/cmp-vsnip",
+	"hrsh7th/vim-vsnip",
+	"hrsh7th/vim-vsnip-integ",
 	{
 		'numToStr/Comment.nvim',
 		opts={},