diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 5801370e..b7cb816c 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -476,6 +476,7 @@ https://github.com/gorbit99/codewindow.nvim - Add Arduino support with [arduino-language-server]. - Add GLSL support with [glsl_analyzer]. - Update fidget-nvim setupOpts and fix NvimTree issue. +- Remove `invalid haskell-tools options`. [itscrystalline](https://github.com/itscrystalline): diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix index 32f45151..6a746208 100644 --- a/modules/plugins/languages/haskell.nix +++ b/modules/plugins/languages/haskell.nix @@ -12,7 +12,7 @@ inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.lua) toLuaObject; - inherit (lib.meta) getExe'; + inherit (lib.meta) getExe getExe'; inherit (lib.generators) mkLuaInline; inherit (pkgs) haskellPackages; @@ -21,9 +21,7 @@ defaultServers = ["hls"]; servers = { hls = { - enable = false; - cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server-wrapper") "--lsp"]; - filetypes = ["haskell" "lhaskell"]; + cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server") "--lsp"]; on_attach = mkLuaInline /* @@ -43,17 +41,6 @@ vim.keymap.set('n', 'rq', ht.repl.quit, opts) end ''; - root_dir = - mkLuaInline - /* - lua - */ - '' - function(bufnr, on_dir) - local fname = vim.api.nvim_buf_get_name(bufnr) - on_dir(util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project', '*.cabal', 'package.yaml')(fname)) - end - ''; settings = { haskell = { formattingProvider = "ormolu"; @@ -122,12 +109,6 @@ in { '' vim.g.haskell_tools = { ${optionalString cfg.lsp.enable '' - -- LSP - tools = { - hover = { - enable = true, - }, - }, hls = ${toLuaObject servers.hls}, ''} ${optionalString cfg.dap.enable '' @@ -135,7 +116,7 @@ in { cmd = ${ if isList cfg.dap.package then toLuaObject cfg.dap.package - else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}'' + else ''{"${getExe cfg.dap.package}"}'' }, }, ''}