diff --git a/.config/nvim/lua/user/plugins/lsp/init.lua b/.config/nvim/lua/user/plugins/lsp/init.lua
index 0f617c7..537616a 100644
--- a/.config/nvim/lua/user/plugins/lsp/init.lua
+++ b/.config/nvim/lua/user/plugins/lsp/init.lua
@@ -4,16 +4,7 @@ return {
 		config = true
 	},
 	{
-		"williamboman/mason-lspconfig.nvim",
-	},
-	{
-		"neovim/nvim-lspconfig",
-		event = "BufReadPre BufNewFile",
-		dependencies = {
-			"williamboman/mason.nvim",
-			"williamboman/mason-lspconfig.nvim",
-			"nvimtools/none-ls.nvim",
-		},
+		"mason-org/mason-lspconfig.nvim",
 		config = function()
 			require("user.plugins.lsp.mason_lsp_config")
 			require("user.plugins.lsp.diagnostics_config").setup()
@@ -33,6 +24,17 @@ return {
 
 			vim.cmd([[ command! Format execute 'lua vim.lsp.buf.format{async=true}' ]])
 		end,
+		dependencies = {
+			{ "mason-org/mason.nvim", opts = {} },
+			"neovim/nvim-lspconfig",
+		},
+	},
+	{
+		"neovim/nvim-lspconfig",
+		event = "BufReadPre BufNewFile",
+		dependencies = {
+			"nvimtools/none-ls.nvim",
+		},
 	},
 	{
 		"lukas-reineke/lsp-format.nvim",
diff --git a/.config/nvim/lua/user/plugins/lsp/mason_lsp_config.lua b/.config/nvim/lua/user/plugins/lsp/mason_lsp_config.lua
index 048a172..df7eaaf 100644
--- a/.config/nvim/lua/user/plugins/lsp/mason_lsp_config.lua
+++ b/.config/nvim/lua/user/plugins/lsp/mason_lsp_config.lua
@@ -4,6 +4,8 @@ vim.lsp.enable({
 	"omnisharp",
 	"pylsp",
 	"rust_analyzer",
+	"luals",
+	"vimls"
 })
 
 -- TODO: this does not work, need to install pylsp-mypy plugin manually
@@ -45,4 +47,20 @@ vim.lsp.config('rust_analyzer', {
 	}
 })
 
+vim.lsp.config('luals', {
+	settings = {
+		Lua = {}
+	}
+})
+
+vim.lsp.config('rust_analyzer', {
+	settings = {
+		["rust-analyzer"] = {
+			cargo = {
+				features = "all",
+			},
+		},
+	}
+})
+
 mason_lspconfig.setup()