Skip to content

languages/haskell: remove invalid vim.g options #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: v0.8
Choose a base branch
from
Open

languages/haskell: remove invalid vim.g options #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e814f8e
languages/haskell: remove invalid vim.g options
siggsy Oct 17, 2025
6c559a1
Describe changes in changelog v0.8
siggsy Oct 17, 2025
43f33b8
languages/haskell: remove language server settings
siggsy Oct 18, 2025
e263205
languages/haskell: remove cmd with hls-wrapper
siggsy Oct 18, 2025
871e04f
Document changes in release-notes/rl-0.8
siggsy Oct 18, 2025
1189e78
Revert "languages/haskell: remove cmd"
siggsy Nov 7, 2025
fdba701
languages/haskell: hls-wrapper -> hls
siggsy Nov 7, 2025
37671ac
docs: fix release notes
siggsy Nov 7, 2025
b5e1250
languages/haskell: set server.enable to false
siggsy Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/release-notes/rl-0.8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,10 @@
[mellow.nvim]: https://github.com/mellow-theme/mellow.nvim

- Add [mellow.nvim] plugin for vim and lualine theme support

[Siggsy](https://github.com/siggsy):

- Fix `vim.languages.haskell.lsp` using `lspconfig` options instead of
`haskell-tools.nvim` options.
- Fix default language server `cmd` by replacing `haskell-language-server-wrapper` with `haskell-language-server`

35 changes: 13 additions & 22 deletions modules/plugins/languages/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.meta) getExe';
inherit (lib.generators) mkLuaInline;
inherit (pkgs) haskellPackages;

cfg = config.vim.languages.haskell;

defaultServers = ["hls"];
defaultServers = ["haskell-tools"];
servers = {
hls = {
haskell-tools = {
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
/*
Expand All @@ -43,23 +43,6 @@
vim.keymap.set('n', '<localleader>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";
cabalFormattingProvider = "cabalfmt";
};
};
};
};
in {
Expand Down Expand Up @@ -98,6 +81,15 @@ in {
};
})

(mkIf cfg.lsp.enable {
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
})

(mkIf (cfg.dap.enable || cfg.lsp.enable) {
vim = {
startPlugins = ["haskell-tools-nvim"];
Expand All @@ -113,7 +105,6 @@ in {
enable = true,
},
},
hls = ${toLuaObject servers.hls},
''}
${optionalString cfg.dap.enable ''
dap = {
Expand Down