haskell lsp + treesitter

siph · Apr 4, 2023 · bce9c12 · bce9c12
1 parent f9a8f08
commit bce9c12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/flake.nix b/flake.nix
@@ -326,8 +326,8 @@
  zig.enable = false;
  java = true;
  kotlin = true;
- lua = true;
  nu = true;
+ haskell = true;
  };
  vim.visuals = {
  enable = true;

diff --git a/modules/lsp/lsp.nix b/modules/lsp/lsp.nix
@@ -63,8 +63,8 @@ in {
  zig.enable = mkEnableOption "Zig language LSP";
  java = mkEnableOption "Java language LSP";
  kotlin = mkEnableOption "Kotlin language LSP";
- lua = mkEnableOption "Lua Language LSP";
  nu = mkEnableOption "Nushell Language LSP";
+ haskell = mkEnableOption "Haskell Language LSP";
  };
 
  config = mkIf cfg.enable (
@@ -313,6 +313,15 @@ in {
  }
  ''}
 
+ ${writeIf cfg.haskell ''
+ --Haskell config
+ lspconfig.hls.setup {
+ capabilities = capabilities,
+ on_attach=default_on_attach,
+ cmd = {"${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper", "--lsp"},
+ }
+ ''}
+
  ${writeIf cfg.python ''
  -- Python config
  lspconfig.pyright.setup{
@@ -384,26 +393,6 @@ in {
  }
  ''}
 
- ${writeIf cfg.lua ''
- -- Kotlin config
- lspconfig.sumneko_lua.setup {
- capabilities = capabilities;
- on_attach = default_on_attach;
- cmd = {"${pkgs.sumneko-lua-language-server}/bin/lua-language-server"},
- Lua = {
- runtime = {
- version = 'LuaJIT',
- },
- diagnostice = {
- globals = {},
- },
- telemetry = {
- enable = false;
- };
- }
- }
- ''}
-
  ${writeIf cfg.clang.enable ''
  -- CCLS (clang) config
  lspconfig.ccls.setup{

diff --git a/modules/treesitter/treesitter.nix b/modules/treesitter/treesitter.nix
@@ -43,12 +43,12 @@ in {
  cpp
  css
  graphql
+ haskell
  html
  java
  javascript
  json
  kotlin
- lua
  make
  markdown-inline
  nix