diff --git a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua
index 407063c..6de4fd0 100644
--- a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua
+++ b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua
@@ -1,88 +1,71 @@
+local config = function() 
+	-- Add additional capabilities supported by nvim-cmp
+	local capabilities = require("cmp_nvim_lsp").default_capabilities()
+	local lspconfig = require('lspconfig')
+
+	-- Enable some language servers with the additional
+	-- completion capabilities offered by nvim-cmp
+	local servers = { 'gopls', 'erlangls' }
+	for _, lsp in ipairs(servers) do
+		lspconfig[lsp].setup {
+			-- on_attach = my_custom_on_attach,
+			capabilities = capabilities,
+		}
+	end
+
+	local luasnip = require 'luasnip'
+
+	local cmp = require 'cmp'
+
+	cmp.setup {
+		snippet = {
+			expand = function(args)
+				luasnip.lsp_expand(args.body)
+			end,
+		},
+		mapping = cmp.mapping.preset.insert({
+			['<C-u>'] = cmp.mapping.scroll_docs(-4), -- Up
+			['<C-d>'] = cmp.mapping.scroll_docs(4), -- Down
+			-- C-b (back) C-f (forward) for snippet placeholder navigation.
+			['<C-Space>'] = cmp.mapping.complete(),
+			['<CR>'] = cmp.mapping.confirm {
+				behavior = cmp.ConfirmBehavior.Replace,
+				select = true,
+			},
+			['<Tab>'] = cmp.mapping(function(fallback)
+				if cmp.visible() then
+					cmp.select_next_item()
+				elseif luasnip.expand_or_jumpable() then
+					luasnip.expand_or_jump()
+				else
+					fallback()
+				end
+			end, { 'i', 's' }),
+			['<S-Tab>'] = cmp.mapping(function(fallback)
+				if cmp.visible() then
+					cmp.select_prev_item()
+				elseif luasnip.jumpable(-1) then
+					luasnip.jump(-1)
+				else
+					fallback()
+				end
+			end, { 'i', 's' }),
+		}),
+		sources = {
+			{ name = 'nvim_lsp' },
+			{ name = 'luasnip' },
+		},
+	}
+end
+
 return {
 	"neovim/nvim-lspconfig",
 	dependencies = {
-		"hrsh7th/cmp-nvim-lsp",
-		'hrsh7th/cmp-buffer',
-		'hrsh7th/cmp-path',
-		'hrsh7th/cmp-cmdline',
 		'hrsh7th/nvim-cmp',
+		'hrsh7th/cmp-nvim-lsp',
+		'saadparwaiz1/cmp_luasnip',
+		'L3MON4D3/LuaSnip',
 	},
-	event = { "BufReadPre", "BufNewFile" },
-	config = function()
-		vim.opt.completeopt = { "menu", "menuone", "noselect" }
-		local has_words_before = function()
-			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({
-			mapping = {
-				['<C-u>'] = cmp.mapping.scroll_docs(-4), -- Up
-				['<C-d>'] = cmp.mapping.scroll_docs(4), -- Down
-				['<C-Space>'] = cmp.mapping.complete(),
-				['<CR>'] = cmp.mapping.confirm {
-					behavior = cmp.ConfirmBehavior.Replace,
-					select = true,
-				},
-				["<Tab>"] = cmp.mapping(function(fallback)
-					if cmp.visible() then
-						cmp.select_next_item()
-					elseif has_words_before() then
-						cmp.complete()
-					else
-						fallback()
-					end
-				end, { "i", "s" }),
-				["<S-Tab>"] = cmp.mapping(function()
-					if cmp.visible() then
-						cmp.select_prev_item()
-					end
-				end, { "i", "s" }),
-			},
-			sources = cmp.config.sources({
-				{ name = 'nvim_lsp' },
-			}, {
-				{ name = 'buffer' },
-			})
-		})
-		local capabilities = require('cmp_nvim_lsp').default_capabilities()
-		local on_attach = function(client, bufnr)
-			local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
-			local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
-		
-			buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-		end
-		local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " }
-		for type, icon in pairs(signs) do
-			local hl = "DiagnosticSign" .. type
-			vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-		end
-
-		local nvim_lsp = require('lspconfig')
-		nvim_lsp.gopls.setup{
-			cmd = {'gopls'},
-			on_attach = on_attach,
-			capabilities = capabilities,
-			settings = {
-				gopls = {
-					experimentalPostfixCompletions = true,
-					analyses = {
-						unusedparams = true,
-						shadow = true,
-					},
-					staticcheck = true,
-					gofumpt = true,
-				},
-			},
-			init_options = {
-				usePlaceholders = true,
-			}
-		}
-	end
+	config = config
 }