NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 22:36:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

lang/haskell: don't install hls

Browse source
This commit is contained in:
Ching Pei Yang 2026-05-07 21:31:20 +02:00
commit 831a8d6e0b
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
3 changed files with 48 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/plugins/languages/haskell.nix
View file

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

1
modules/plugins/lsp/presets/default.nix
View file

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

54
modules/plugins/lsp/presets/haskell-tools.nix
View file

@ -1,47 +1,49 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib.meta) getExe';
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.nvim.types) mkLspPresetEnableOption;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
cfg = config.vim.lsp.presets.haskell-tools; cfg = config.vim.lsp.presets.haskell-tools;
haskell-toolsPackage = pkgs.haskellPackages.haskell-language-server;
in { in {
options.vim.lsp.presets.haskell-tools = { options.vim.lsp.presets.haskell-tools = {
enable = mkLspPresetEnableOption "haskell-tools-nvim" "Haskell" ["haskell"]; enable = mkLspPresetEnableOption "haskell-tools-nvim" "Haskell" ["haskell"];
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.lsp.servers.haskell-tools = { vim = {
# The plugin will handle startup lsp.servers.haskell-tools = {
enable = false; # The plugin will handle startup
# TODO: does this actually work? enable = false;
cmd = [(getExe' haskell-toolsPackage "haskell-language-server-wrapper")]; # NOTE: pkgs.haskell-language-server does not expose the haskell-language-server program
on_attach = mkLuaInline '' on_attach = mkLuaInline ''
function(client, bufnr) function(client, bufnr)
local ht = require("haskell-tools") local ht = require("haskell-tools")
local opts = { noremap = true, silent = true, buffer = bufnr } local opts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set('n', '<localleader>cl', vim.lsp.codelens.run, opts) vim.keymap.set('n', '<localleader>cl', vim.lsp.codelens.run, opts)
vim.keymap.set('n', '<localleader>hs', ht.hoogle.hoogle_signature, opts) vim.keymap.set('n', '<localleader>hs', ht.hoogle.hoogle_signature, opts)
vim.keymap.set('n', '<localleader>ea', ht.lsp.buf_eval_all, opts) vim.keymap.set('n', '<localleader>ea', ht.lsp.buf_eval_all, opts)
vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts) vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
vim.keymap.set('n', '<localleader>rf', function() vim.keymap.set('n', '<localleader>rf', function()
ht.repl.toggle(vim.api.nvim_buf_get_name(0)) ht.repl.toggle(vim.api.nvim_buf_get_name(0))
end, opts) end, opts)
vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts) vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
end end
''; '';
settings = { settings = {
haskell = { haskell = {
formattingProvider = "ormolu"; formattingProvider = "ormolu";
cabalFormattingProvider = "cabal-fmt"; cabalFormattingProvider = "cabal-fmt";
};
}; };
}; };
languages.haskell.extensions.haskell-tools-nvim = {
enable = true;
};
}; };
}; };
} }