diff --git a/lua/config/plugins/cmp.lua b/lua/config/plugins/cmp.lua
new file mode 100644
index 0000000..44d1645
--- /dev/null
+++ b/lua/config/plugins/cmp.lua
@@ -0,0 +1,36 @@
+-- Set up nvim-cmp.
+local cmp = require'cmp'
+require("luasnip.loaders.from_vscode").lazy_load()
+
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+    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(),
+    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  }),
+  sources = cmp.config.sources({
+    -- { name = 'nvim_lsp' },
+    { name = 'luasnip' }, -- For luasnip users.
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
+})
diff --git a/lua/config/plugins/lsp.lua b/lua/config/plugins/lsp.lua
new file mode 100644
index 0000000..e7b4600
--- /dev/null
+++ b/lua/config/plugins/lsp.lua
@@ -0,0 +1,2 @@
+local lspconfig = require("lspconfig")
+lspconfig.lua_ls.setup({})
diff --git a/lua/config/plugins/mason.lua b/lua/config/plugins/mason.lua
new file mode 100644
index 0000000..af77151
--- /dev/null
+++ b/lua/config/plugins/mason.lua
@@ -0,0 +1,9 @@
+require("mason").setup({
+    ui = {
+        icons = {
+            package_installed = "✓",
+            package_pending = "➜",
+            package_uninstalled = "✗"
+        }
+    }
+})
diff --git a/lua/config/plugins/treesitter.lua b/lua/config/plugins/treesitter.lua
new file mode 100644
index 0000000..9a396a6
--- /dev/null
+++ b/lua/config/plugins/treesitter.lua
@@ -0,0 +1,41 @@
+require'nvim-treesitter.configs'.setup {
+  -- A list of parser names, or "all" (the listed parsers MUST always be installed)
+  ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" },
+
+  -- Install parsers synchronously (only applied to `ensure_installed`)
+  sync_install = false,
+
+  -- Automatically install missing parsers when entering buffer
+  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+  auto_install = true,
+
+  -- List of parsers to ignore installing (or "all")
+  ignore_install = { "javascript" },
+
+  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
+  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
+
+  highlight = {
+    enable = true,
+
+    -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+    -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+    -- the name of the parser)
+    -- list of language that will be disabled
+    disable = { "c", "rust" },
+    -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
+    disable = function(lang, buf)
+        local max_filesize = 100 * 1024 -- 100 KB
+        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+        if ok and stats and stats.size > max_filesize then
+            return true
+        end
+    end,
+
+    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+    -- Using this option may slow down your editor, and you may see some duplicate highlights.
+    -- Instead of true it can also be a list of languages
+    additional_vim_regex_highlighting = false,
+  },
+}
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
new file mode 100644
index 0000000..671c0f1
--- /dev/null
+++ b/lua/plugins/cmp.lua
@@ -0,0 +1,19 @@
+return {
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+      "hrsh7th/cmp-nvim-lsp"
+    },
+    opts = function()
+      require "config.plugins.cmp"
+    end,
+  },
+  {
+    "L3MON4D3/LuaSnip",
+    dependencies = { 
+      "saadparwaiz1/cmp_luasnip",
+      "rafamadriz/friendly-snippets"
+    },
+    opts = {}
+  },
+}
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
new file mode 100644
index 0000000..8b79493
--- /dev/null
+++ b/lua/plugins/lspconfig.lua
@@ -0,0 +1,34 @@
+return {
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      require("mason").setup({
+        ui = {
+          icons = {
+            package_installed = "✓",
+            package_pending = "➜",
+            package_uninstalled = "✗"
+          }
+        }
+      })
+    }
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = function()
+      require "config.plugins.mason"
+    end,
+  },
+  {
+    "williamboman/mason-lspconfig.nvim",
+    dependencies = {
+      "williamboman/mason.nvim",
+      "neovim/nvim-lspconfig" 
+    },
+    opts = {
+      require("mason-lspconfig").setup({
+        ensure_installed = { "lua_ls" },
+      })
+    }
+  },
+}
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
new file mode 100644
index 0000000..ca1814f
--- /dev/null
+++ b/lua/plugins/mason.lua
@@ -0,0 +1,21 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    dependencies = {},
+    opts = function()
+      require "config.plugins.mason"
+    end,
+  },
+  {
+    "williamboman/mason-lspconfig.nvim",
+    dependencies = {
+      "williamboman/mason.nvim",
+      "neovim/nvim-lspconfig" 
+    },
+    opts = {
+      require("mason-lspconfig").setup({
+        ensure_installed = { "lua_ls" },
+      })
+    }
+  },
+}