17 files changed, 18 insertions, 17 deletions
diff --git a/lua/user/autopairs.lua b/lua/user/core/autopairs.lua
index 96be89e..96be89e 100644
--- a/lua/user/autopairs.lua
+++ b/lua/user/core/autopairs.lua
diff --git a/lua/user/bufferline.lua b/lua/user/core/bufferline.lua
index 92ab513..92ab513 100644
--- a/lua/user/bufferline.lua
+++ b/lua/user/core/bufferline.lua
diff --git a/lua/user/cmp.lua b/lua/user/core/cmp.lua
index ff6a97e..ff6a97e 100644
--- a/lua/user/cmp.lua
+++ b/lua/user/core/cmp.lua
diff --git a/lua/user/comment.lua b/lua/user/core/comment.lua
index 7d36862..7d36862 100644
--- a/lua/user/comment.lua
+++ b/lua/user/core/comment.lua
diff --git a/lua/user/gitsigns.lua b/lua/user/core/gitsigns.lua
index ca88cdf..ca88cdf 100644
--- a/lua/user/gitsigns.lua
+++ b/lua/user/core/gitsigns.lua
diff --git a/lua/user/core/init.lua b/lua/user/core/init.lua
new file mode 100644
index 0000000..64d8e28
--- /dev/null
+++ b/lua/user/core/init.lua
@@ -0,0 +1,9 @@
+require 'user.core.autopairs'
+require 'user.core.bufferline'
+require 'user.core.cmp'
+require 'user.core.comment'
+require 'user.core.telescope'
+require 'user.core.treesitter'
+require 'user.core.gitsigns'
+require 'user.core.nvim-tree'
+require 'user.core.lsp'
diff --git a/lua/user/lsp/handlers.lua b/lua/user/core/lsp/handlers.lua
index 853beb3..853beb3 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/core/lsp/handlers.lua
diff --git a/lua/user/core/lsp/init.lua b/lua/user/core/lsp/init.lua
new file mode 100644
index 0000000..a95a5ca
--- /dev/null
+++ b/lua/user/core/lsp/init.lua
@@ -0,0 +1,3 @@
+require 'user.core.lsp.mason'
+require('user.core.lsp.handlers').setup()
+require 'user.core.lsp.null-ls'
diff --git a/lua/user/lsp/mason.lua b/lua/user/core/lsp/mason.lua
index b841d72..9708ec8 100644
--- a/lua/user/lsp/mason.lua
+++ b/lua/user/core/lsp/mason.lua
@@ -46,14 +46,14 @@ mason_lspconfig.setup({
 mason_lspconfig.setup_handlers({
   function(server_name)
     local opts = {
-      on_attach = require("user.lsp.handlers").on_attach,
-      capabilities = require("user.lsp.handlers").capabilities,
+      on_attach = require("user.core.lsp.handlers").on_attach,
+      capabilities = require("user.core.lsp.handlers").capabilities,
       falgs = {
         debounce_text_changes = 5000,
       },
     }
 
-    local require_ok, server = pcall(require, "user.lsp.settings." .. server_name)
+    local require_ok, server = pcall(require, "user.core.lsp.settings." .. server_name)
     if require_ok then
       opts = vim.tbl_deep_extend("force", server, opts)
     end
diff --git a/lua/user/lsp/null-ls.lua b/lua/user/core/lsp/null-ls.lua
index 389e68f..389e68f 100644
--- a/lua/user/lsp/null-ls.lua
+++ b/lua/user/core/lsp/null-ls.lua
diff --git a/lua/user/lsp/settings/sumneko_lua.lua b/lua/user/core/lsp/settings/sumneko_lua.lua
index d7e82b4..d7e82b4 100644
--- a/lua/user/lsp/settings/sumneko_lua.lua
+++ b/lua/user/core/lsp/settings/sumneko_lua.lua
diff --git a/lua/user/nvim-tree.lua b/lua/user/core/nvim-tree.lua
index d94da10..d94da10 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/core/nvim-tree.lua
diff --git a/lua/user/telescope.lua b/lua/user/core/telescope.lua
index 86d1e51..86d1e51 100644
--- a/lua/user/telescope.lua
+++ b/lua/user/core/telescope.lua
diff --git a/lua/user/treesitter.lua b/lua/user/core/treesitter.lua
index 05d8fbf..05d8fbf 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/core/treesitter.lua
diff --git a/lua/user/init.lua b/lua/user/init.lua
index 12b3873..161a34b 100644
--- a/lua/user/init.lua
+++ b/lua/user/init.lua
@@ -1,14 +1,6 @@
+require 'user.plugins'
 require 'user.options'
 require 'user.bepo'
 require 'user.keymaps'
-require 'user.plugins'
 require 'user.colorscheme'
-require 'user.cmp'
-require 'user.lsp'
-require 'user.comment'
-require 'user.telescope'
-require 'user.treesitter'
-require 'user.autopairs'
-require 'user.gitsigns'
-require 'user.nvim-tree'
-require 'user.bufferline'
+require 'user.core'
diff --git a/lua/user/lsp/init.lua b/lua/user/lsp/init.lua
deleted file mode 100644
index 50c423a..0000000
--- a/lua/user/lsp/init.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'user.lsp.mason'
-require('user.lsp.handlers').setup()
-require 'user.lsp.null-ls'
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 74d1c55..e8efb4e 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -47,7 +47,7 @@ return packer.startup(function(use)
   use 'nvim-lua/popup.nvim'             -- An implementation of the Popup API from vim in Neovim
   use 'nvim-lua/plenary.nvim'           -- Useful lua functions used in lots of plugins
   use 'numToStr/Comment.nvim'           -- gc[N][motion]
-  -- use 'windwp/nvim-autopairs'           -- Autopairs, integrates with both cmp and treesitter
+  use 'windwp/nvim-autopairs'           -- Autopairs, integrates with both cmp and treesitter
   use 'kyazdani42/nvim-web-devicons'    -- nices icons
   use 'kyazdani42/nvim-tree.lua'        -- tree explorer
   use 'akinsho/bufferline.nvim'         -- buffer status line