Merge 637f749d4c into 46aa168b2d

configuration.nix

@@ -74,6 +74,7 @@ isMaximal: {
       julia.enable = false;
       vala.enable = false;
       scala.enable = false;
+      solidity.enable = false;
       r.enable = false;
       gleam.enable = false;
       dart.enable = false;

docs/release-notes/rl-0.8.md

@@ -14,6 +14,7 @@
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
 
 - Add Haskell support under `vim.languages.haskell` using [haskell-tools.nvim].
+- Add Solidity support under `vim.languages.solidity`.
 
 [diniamo](https://github.com/diniamo):
 

modules/plugins/languages/default.nix

@@ -27,6 +27,7 @@ in {
     ./r.nix
     ./rust.nix
     ./scala.nix
+    ./solidity.nix
     ./sql.nix
     ./svelte.nix
     ./tailwind.nix

modules/plugins/languages/haskell.nix

@@ -71,7 +71,7 @@ in {
                 cmd = ${
                 if isList cfg.lsp.package
                 then expToLua cfg.lsp.package
-                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper"}''
+                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}''
               },
                 on_attach = function(client, bufnr, ht)
                   default_on_attach(client, bufnr, ht)

modules/plugins/languages/solidity.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.vim.languages.solidity;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim) mkGrammarOption;
+in {
+  options.vim.languages.solidity = {
+    enable = mkEnableOption "Solidity support";
+
+    treesitter = {
+      enable = mkEnableOption "Treesitter support for Solidity";
+      package = mkGrammarOption pkgs "solidity";
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (lib.mkIf cfg.treesitter.enable {
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
+    })
+  ]);
+}