NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 02:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update haskell-tools

Browse source
This commit is contained in:
sjcobb 2025-06-16 15:23:40 +01:00
commit e24383e556
2 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configuration.nix
View file

@ -82,7 +82,8 @@ isMaximal: {
dart.enable = false; dart.enable = false;
ocaml.enable = false; ocaml.enable = false;
elixir.enable = false; elixir.enable = false;
haskell.enable = false; haskell.enable = true;
hcl.enable = true;
ruby.enable = false; ruby.enable = false;
fsharp.enable = false; fsharp.enable = false;

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

@ -4,46 +4,28 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (builtins) isList; inherit (builtins) isList attrNames;
inherit (lib.types) either package listOf str; inherit (lib.types) either package enum listOf str;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) optionalString; inherit (lib.strings) optionalString;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption enum attrNames; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.dag) entryAfter entryBefore;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
inherit (lib.meta) getExe; inherit (lib.meta) getExe';
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (pkgs) haskellPackages; inherit (pkgs) haskellPackages;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.languages.haskell; cfg = config.vim.languages.haskell;
defaultServers = ["hls"]; defaultServers = ["haskell-tools"];
servers = { servers = {
hls = { haskell-tools = {
enable = true; enable = false;
cmd = [(getExe pkgs.haskellPackages.haskell-language-server) "--lsp"]; cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server-wrapper") "--lsp"];
filetypes = ["haskell" "lhaskell"]; filetypes = ["haskell" "lhaskell"];
on_attach =
mkLuaInline
/*
lua
*/
''
function(client, bufnr, ht)
default_on_attach(client, bufnr, ht)
local opts = { noremap = true, silent = true, buffer = bufnr }
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>ea', ht.lsp.buf_eval_all, opts)
vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
vim.keymap.set('n', '<localleader>rf', function()
ht.repl.toggle(vim.api.nvim_buf_get_name(0))
end, opts)
vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
end,
'';
root_dir = root_dir =
mkLuaInline mkLuaInline
/* /*
@ -124,7 +106,20 @@ in {
}, },
}, },
-- Configured through vim.lsp.config -- Configured through vim.lsp.config
hls = {}, hls = {
on_attach = function(client, bufnr, ht)
default_on_attach(client, bufnr, ht)
local opts = { noremap = true, silent = true, buffer = bufnr }
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>ea', ht.lsp.buf_eval_all, opts)
vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
vim.keymap.set('n', '<localleader>rf', function()
ht.repl.toggle(vim.api.nvim_buf_get_name(0))
end, opts)
vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
end,
}
''} ''}
${optionalString cfg.dap.enable '' ${optionalString cfg.dap.enable ''
dap = { dap = {