mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-05-19 13:30:17 +00:00
languages/haskell.nix: address PR comments
- Rename hls -> haskell-language-server to match the nixpkgs name - Remove unneeded injection - Only set lsp filetypes in the language module, not the preset - Remove unneeded `mkDefault` - Use `root_markers` instead of yucky inline Lua
This commit is contained in:
parent
ca21d43590
commit
a97aa7d724
5 changed files with 38 additions and 48 deletions
|
|
@ -18,9 +18,9 @@
|
|||
|
||||
cfg = config.vim.languages.haskell;
|
||||
|
||||
defaultServers = ["hls"];
|
||||
defaultServers = ["haskell-language-server"];
|
||||
servers = {
|
||||
hls = {};
|
||||
haskell-language-server = {};
|
||||
};
|
||||
in {
|
||||
options.vim.languages.haskell = {
|
||||
|
|
@ -84,6 +84,8 @@ in {
|
|||
};
|
||||
})
|
||||
|
||||
# haskell-tools prefers to manage the lsp directly,
|
||||
# so we only configure the lsp ourselves if haskell-tools is disabled
|
||||
(mkIf (cfg.lsp.enable && !cfg.extensions.haskell-tools.enable) {
|
||||
vim.lsp = {
|
||||
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue