diff --git a/lua/cosmic/lsp/autocomplete.lua b/lua/cosmic/lsp/autocomplete.lua
index e8a57b4..24dcc94 100644
--- a/lua/cosmic/lsp/autocomplete.lua
+++ b/lua/cosmic/lsp/autocomplete.lua
@@ -1,90 +1,98 @@
-local cmp = require('cmp')
-local luasnip = require('luasnip')
+local M = {}
 
-vim.cmd([[
-autocmd FileType TelescopePrompt lua require('cmp').setup.buffer { enabled = false }
-]])
+M.init = function()
+  local cmp = require('cmp')
+  local luasnip = require('luasnip')
 
-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
+  vim.cmd([[
+  autocmd FileType TelescopePrompt lua require('cmp').setup.buffer { enabled = false }
+  ]])
+
+  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
+
+  cmp.setup({
+    snippet = {
+      expand = function(args)
+        luasnip.lsp_expand(args.body)
+      end,
+    },
+    mapping = {
+      ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+      ['<C-u>'] = cmp.mapping.scroll_docs(4),
+      ['<C-Space>'] = cmp.mapping.complete(),
+      ['<C-e>'] = cmp.mapping.close(),
+      -- disabled for autopairs mapping
+      ['<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()
+        elseif has_words_before() then
+          cmp.complete()
+        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',
+      }),
+    },
+    documentation = {
+      border = 'single',
+      winhighlight = 'FloatBorder:FloatBorder,Normal:Normal',
+    },
+    experimental = {
+      ghost_text = true,
+    },
+    sources = cmp.config.sources({
+      { name = 'nvim_lsp' },
+      { name = 'nvim_lua' },
+      { name = 'buffer' },
+      { name = 'luasnip' },
+      { name = 'path' },
+    }),
+    formatting = {
+      format = require('lspkind').cmp_format({
+        with_text = true,
+        menu = {
+          buffer = '[buf]',
+          nvim_lsp = '[LSP]',
+          nvim_lua = '[VimApi]',
+          path = '[path]',
+          luasnip = '[snip]',
+        },
+      }),
+    },
+  })
 end
 
-cmp.setup({
-  snippet = {
-    expand = function(args)
-      luasnip.lsp_expand(args.body)
-    end,
-  },
-  mapping = {
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-u>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.close(),
-    -- disabled for autopairs mapping
-    ['<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()
-      elseif has_words_before() then
-        cmp.complete()
-      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',
-    }),
-  },
-  documentation = {
-    border = 'single',
-    winhighlight = 'FloatBorder:FloatBorder,Normal:Normal',
-  },
-  experimental = {
-    ghost_text = true,
-  },
-  sources = cmp.config.sources({
-    { name = 'nvim_lsp' },
-    { name = 'nvim_lua' },
-    { name = 'buffer' },
-    { name = 'luasnip' },
-    { name = 'path' },
-  }),
-  formatting = {
-    format = require('lspkind').cmp_format({
-      with_text = true,
-      menu = {
-        buffer = '[buf]',
-        nvim_lsp = '[LSP]',
-        nvim_lua = '[VimApi]',
-        path = '[path]',
-        luasnip = '[snip]',
-      },
-    }),
-  },
-})
+M.autopairs = function()
+  require('nvim-autopairs').setup({
+    disable_filetype = { 'TelescopePrompt', 'vim' },
+  })
 
-require('nvim-autopairs').setup({
-  disable_filetype = { 'TelescopePrompt', 'vim' },
-})
+  local cmp_autopairs = require('nvim-autopairs.completion.cmp')
 
-local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+  require('cmp').event:on('confirm_done', cmp_autopairs.on_confirm_done())
+end
 
-cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+return M
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua
index abe917f..2c735cd 100644
--- a/lua/cosmic/pluginsInit.lua
+++ b/lua/cosmic/pluginsInit.lua
@@ -121,7 +121,7 @@ return packer.startup(function()
   use({
     'hrsh7th/nvim-cmp',
     config = function()
-      require('cosmic.lsp.autocomplete')
+      require('cosmic.lsp.autocomplete').init()
     end,
     requires = {
       'hrsh7th/cmp-nvim-lsp',
@@ -131,9 +131,17 @@ return packer.startup(function()
       'hrsh7th/nvim-cmp',
       'L3MON4D3/LuaSnip',
       'saadparwaiz1/cmp_luasnip',
-      'windwp/nvim-autopairs',
       'onsails/lspkind-nvim',
     },
+    event = 'InsertEnter',
+  })
+
+  use({
+    'windwp/nvim-autopairs',
+    config = function()
+      require('cosmic.lsp.autocomplete').autopairs()
+    end,
+    after = 'nvim-cmp',
   })
 
   -- git commands