Merge dbba6e31f8 into 459a4c3b10

lua/lazyvim/plugins/extras/lang/haskell.lua

@@ -50,11 +50,6 @@ return {
     },
   },
 
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "haskell-language-server" } },
-  },
-
   {
     "mfussenegger/nvim-dap",
     optional = true,
@@ -132,13 +127,22 @@ return {
         haskell = { "hlint" },
       },
     },
+    dependencies = {
+      {
+        "mason-org/mason.nvim",
+        opts = { ensure_installed = { "hlint" } },
+      },
+    },
   },
 
-  -- Make sure lspconfig doesn't start hls,
+  -- Make sure neither lspconfig nor mason-lspconfig starts hls,
   -- as it conflicts with haskell-tools
   {
     "neovim/nvim-lspconfig",
     opts = {
+      servers = {
+        hls = {},
+      },
       setup = {
         hls = function()
           return true