diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 8aee305..eec6e98 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -45,9 +45,10 @@ Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-repeat'
 
-" https://github.com/neovim/nvim-lspconfig
+Plug 'williamboman/mason.nvim'
+Plug 'williamboman/mason-lspconfig.nvim'
 Plug 'neovim/nvim-lspconfig'
-Plug 'kabouzeid/nvim-lspinstall'
+""  Plug 'kabouzeid/nvim-lspinstall'
 
 "Plug 'zchee/nvim-go', { 'do': 'make'}
 Plug 'fatih/vim-go', { 'for': ['go', 'gomod', 'gohtmltmpl', 'gotexttmpl'], 'do': ':GoInstallBinaries' }
@@ -474,14 +475,45 @@ hi CursorLineNR cterm=bold
 lua <<EOF
 require('nvim-highlight-colors').setup {enable_tailwind = true}
 
-require'lspconfig'.gopls.setup{
-	filetypes = {"go", "gomod", "gowork", "gotmpl", "gohtmltmpl"}
+require("mason").setup({
+    ui = {
+        icons = {
+            package_installed = "✓",
+            package_pending = "➜",
+            package_uninstalled = "✗"
+        }
+    }
+})
+require("mason-lspconfig").setup()
+
+local lspconfig = require('lspconfig')
+lspconfig.rnix.setup {}
+lspconfig.gotests.setup {}
+lspconfig.bashls.setup {}
+lspconfig.djlint.setup {}
+lspconfig.ansiblels.setup {}
+lspconfig.terraformls.setup {}
+lspconfig.lua_ls.setup {}
+lspconfig.dhall_lsp_server.setup {}
+lspconfig.hadolint.setup {}
+lspconfig.pylsp.setup {}
+lspconfig.shfmt.setup {}
+lspconfig.vint.setup {}
+lspconfig.yamllint.setup {}
+lspconfig.zls.setup {}
+
+lspconfig.golangci_lint.setup {}
+lspconfig.golangci_lint_ls.setup {}
+lspconfig.gopls.setup{
+	filetypes = {"go", "gomod", "gowork", "gotmpl", "gohtmltmpl"},
+  options = {"-remote=unix;/tmp/.gopls-daemon.sock"}
 }
-require'lspconfig'.vimls.setup{}
-require'lspconfig'.tailwindcss.setup{
+lspconfig.vimls.setup{}
+lspconfig.tailwindcss.setup{
 	filetypes = { "aspnetcorerazor", "astro", "astro-markdown", "blade", "clojure", "django-html", "htmldjango", "edge", "eelixir", "elixir", "ejs", "erb", "eruby", "gohtml", "gohtmltmpl", "gotmpl", "haml", "handlebars", "hbs", "html", "html-eex", "heex", "jade", "leaf", "liquid", "markdown", "mdx", "mustache", "njk", "nunjucks", "php", "razor", "slim", "twig", "css", "less", "postcss", "sass", "scss", "stylus", "sugarss", "javascript", "javascriptreact", "reason", "rescript", "typescript", "typescriptreact", "vue", "svelte" }
 }
-require'lspconfig'.html.setup{}
+lspconfig.html.setup{}
+
 
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next)