diff --git a/lua/lsp_setup.lua b/lua/lsp_setup.lua
deleted file mode 100644
index 4bca5f9..0000000
--- a/lua/lsp_setup.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-local default_setup = function(server)
-	require("lspconfig")[server].setup({
-		capabilities = lsp_capabilities,
-	})
-end
-
--- enable mason and configure icons
-require("mason").setup({
-	ui = {
-		icons = {
-			package_installed = "✓",
-			package_pending = "➜",
-			package_uninstalled = "✗",
-		},
-	},
-})
-
-require("mason-lspconfig").setup({
-	ensure_installed = {
-		"tsserver",
-		"cssls",
-		"html",
-		"bashls" --[[ "marksman", ]]
-	},
-	handlers = {
-		default_setup,
-	},
-})
-
diff --git a/lua/setup/lsp.lua b/lua/setup/lsp.lua
index a2d3531..6b631f7 100644
--- a/lua/setup/lsp.lua
+++ b/lua/setup/lsp.lua
@@ -1,3 +1,36 @@
+local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+local default_setup = function(server)
+	require("lspconfig")[server].setup({
+		capabilities = lsp_capabilities,
+	})
+end
+
+-- enable mason and configure icons
+require("mason").setup({
+	ui = {
+		icons = {
+			package_installed = "✓",
+			package_pending = "➜",
+			package_uninstalled = "✗",
+		},
+	},
+})
+
+require("mason-lspconfig").setup({
+	ensure_installed = {
+		"tsserver",
+		"cssls",
+		"html",
+		"bashls",
+		"eslint",
+		"marksman",
+	},
+	handlers = {
+		default_setup,
+	},
+})
+
 local lspconfig = require("lspconfig")
 
 require("mason-lspconfig").setup_handlers({