diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua
index a3cad37..def7cac 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua
@@ -4,13 +4,14 @@ return {
 	version = false, -- last release is way too old
 	event = "InsertEnter",
 	dependencies = {
-		"hrsh7th/cmp-nvim-lsp",
+		"L3MON4D3/LuaSnip",
+		"davidsierradz/cmp-conventionalcommits",
 		"hrsh7th/cmp-buffer",
+		"hrsh7th/cmp-cmdline",
+		"hrsh7th/cmp-nvim-lsp",
 		"hrsh7th/cmp-path",
 		"petertriho/cmp-git",
-		"hrsh7th/cmp-cmdline",
 		"saadparwaiz1/cmp_luasnip",
-		"L3MON4D3/LuaSnip",
 		"windwp/nvim-autopairs",
 	},
 	config = function()
@@ -62,6 +63,7 @@ return {
 				}),
 			}),
 			sources = cmp.config.sources({
+				{ name = "conventionalcommits" },
 				{ name = "nvim_lsp" },
 				{ name = "luasnip" },
 				{ name = "buffer" },
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
index 6b0d8f9..b18351a 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
@@ -7,7 +7,7 @@ return {
 		{ "williamboman/mason.nvim" },
 		"williamboman/mason-lspconfig.nvim",
 		-- Additional lua configuration, makes nvim stuff amazing!
-		{ "folke/neodev.nvim", opts = {} },
+		{ "folke/neodev.nvim",      opts = {} },
 	},
 
 	config = function()
@@ -132,6 +132,7 @@ return {
 
 		mason_lspconfig.setup({
 			ensure_installed = vim.tbl_keys(servers),
+			automatic_installation = { exclude = { "astro", "phpactor", "gopls", "rust_analyzer", "sqlls" } },
 		})
 
 		mason_lspconfig.setup_handlers({
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
index 7cfd77d..df1369e 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
@@ -1,7 +1,7 @@
 return {
 	"williamboman/mason.nvim",
 	cmd = "Mason",
-	keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
+	keys = { { "<leader>um", "<cmd>Mason<cr>", desc = "Mason" } },
 	build = ":MasonUpdate",
 	opts = {
 		ensure_installed = {
@@ -13,7 +13,6 @@ return {
 			"prettierd",
 			"shellcheck",
 			"stylua",
-			"gofumpt", "golines", "goimports-reviser", "gopls"
 		},
 	},
 }