lang/haskell: don't install hls

modules/plugins/languages/haskell.nix

@@ -4,14 +4,14 @@
   pkgs,
   ...
 }: let
-  inherit (builtins) isList attrNames;
-  inherit (lib.types) either package enum listOf str;
+  inherit (builtins) isList;
+  inherit (lib.attrsets) genAttrs;
+  inherit (lib.types) either package listOf str;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption enumWithRename;
   inherit (lib.nvim.dag) entryAfter;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.custom) enumWithRename;
   inherit (pkgs) haskellPackages;
 
   cfg = config.vim.languages.haskell;
@@ -43,7 +43,7 @@ in {
         type = listOf (
           enumWithRename
           "vim.languages.haskell.lsp.servers"
-          (attrNames servers)
+          servers
           {hls = "haskell-tools";}
         );
         default = defaultServers;
@@ -53,9 +53,10 @@ in {
 
           > [!NOTE]
           >
-          > HLS is extremely picky about your GHC version - most likely you'll
-          > have to install your specific HLS version in a devShell that matches
-          > your GHC version.
+          > Since HLS is very picky about the GHC version, we do not provide
+          > a default HLS. You'll have to install your own. It is recommended
+          > to install `haskell-language-server` in a devShell, along with the
+          > GHC version you need.
         '';
       };
     };
@@ -90,6 +91,15 @@ in {
       };
     })
 
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = ["haskell" "lhaskell"];
+        });
+      };
+    })
+
     (mkIf cfg.dap.enable {
       vim.languages.haskell.extensions.haskell-tools-nvim = {
         enable = true;
@@ -107,12 +117,7 @@ in {
     (mkIf cfg.extensions.haskell-tools-nvim.enable {
       vim = {
         startPlugins = ["haskell-tools-nvim"];
-        luaConfigRC.haskell-tools-nvim =
-          entryAfter
-          ["lsp-servers"]
-          ''
-            vim.g.haskell_tools = ${cfg.extensions.haskell-tools-nvim.setupOpts}
-          '';
+        globals.haskell_tools = cfg.extensions.haskell-tools-nvim.setupOpts;
       };
     })
   ]);

modules/plugins/lsp/presets/default.nix

@@ -21,6 +21,7 @@
     ./glsl_analyzer.nix
     ./gopls.nix
     ./harper.nix
+    ./haskell-tools.nix
     ./helm-ls.nix
     ./intelephense.nix
     ./jdt-language-server.nix

modules/plugins/lsp/presets/haskell-tools.nix

@@ -1,27 +1,24 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
-  inherit (lib.meta) getExe';
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkLspPresetEnableOption;
   inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.lsp.presets.haskell-tools;
-  haskell-toolsPackage = pkgs.haskellPackages.haskell-language-server;
 in {
   options.vim.lsp.presets.haskell-tools = {
     enable = mkLspPresetEnableOption "haskell-tools-nvim" "Haskell" ["haskell"];
   };
 
   config = mkIf cfg.enable {
-    vim.lsp.servers.haskell-tools = {
+    vim = {
+      lsp.servers.haskell-tools = {
         # The plugin will handle startup
         enable = false;
-      # TODO: does this actually work?
-      cmd = [(getExe' haskell-toolsPackage "haskell-language-server-wrapper")];
+        # NOTE: pkgs.haskell-language-server does not expose the haskell-language-server program
         on_attach = mkLuaInline ''
           function(client, bufnr)
               local ht = require("haskell-tools")
@@ -43,5 +40,10 @@ in {
           };
         };
       };
+
+      languages.haskell.extensions.haskell-tools-nvim = {
+        enable = true;
+      };
+    };
   };
 }