Merge branch 'main' into languages/add-intelephense-php-lsp

.github/workflows/cachix.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           authToken: ${{ secrets.CACHIX_TOKEN }}
           extraPullNames: nix-community

docs/release-notes/rl-0.8.md

@@ -159,8 +159,10 @@
 [thamenato](https://github.com/thamenato):
 
 [ruff]: (https://github.com/astral-sh/ruff)
+[cue]: (https://cuelang.org/)
 
 - Add [ruff] as a formatter option in `vim.languages.python.format.type`.
+- Add [cue] support under `vim.languages.cue`.
 
 [ARCIII](https://github.com/ArmandoCIII):
 
@@ -244,4 +246,9 @@
 
 [viicslen](https://github.com/viicslen):
 
-- Add `intelephense` language server suppor under `vim.languages.php.lsp.server`
+- Add `intelephense` language server support under
+  `vim.languages.php.lsp.server`
+
+[Butzist](https://github.com/butzist):
+
+- Add Helm chart support under `vim.languages.helm`.

modules/plugins/languages/cue.nix

@@ -0,0 +1,51 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) package;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.cue;
+in {
+  options.vim.languages.cue = {
+    enable = mkEnableOption "CUE language support";
+
+    treesitter = {
+      enable = mkEnableOption "CUE treesitter" // {default = config.vim.languages.enableTreesitter;};
+
+      package = mkGrammarOption pkgs "cue";
+    };
+
+    lsp = {
+      enable = mkEnableOption "CUE LSP support" // {default = config.vim.languages.enableLSP;};
+
+      package = mkOption {
+        type = package;
+        default = pkgs.cue;
+        description = "cue lsp implementation";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.cue-lsp = ''
+        lspconfig.cue.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/cue", "lsp"},
+        }
+      '';
+    })
+  ]);
+}

modules/plugins/languages/default.nix

@@ -5,6 +5,7 @@ in {
     ./asm.nix
     ./astro.nix
     ./bash.nix
+    ./cue.nix
     ./dart.nix
     ./clang.nix
     ./css.nix
@@ -12,6 +13,7 @@ in {
     ./gleam.nix
     ./go.nix
     ./hcl.nix
+    ./helm.nix
     ./kotlin.nix
     ./html.nix
     ./haskell.nix

modules/plugins/languages/helm.nix

@@ -0,0 +1,89 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
+
+  cfg = config.vim.languages.helm;
+  yamlCfg = config.vim.languages.yaml;
+
+  helmCmd =
+    if isList cfg.lsp.package
+    then cfg.lsp.package
+    else ["${cfg.lsp.package}/bin/helm_ls" "serve"];
+  yamlCmd =
+    if isList yamlCfg.lsp.package
+    then builtins.elemAt yamlCfg.lsp.package 0
+    else "${yamlCfg.lsp.package}/bin/yaml-language-server";
+
+  defaultServer = "helm-ls";
+  servers = {
+    helm-ls = {
+      package = pkgs.helm-ls;
+      lspConfig = ''
+        lspconfig.helm_ls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${expToLua helmCmd},
+          settings = {
+            ['helm-ls'] = {
+              yamlls = {
+                  path = "${yamlCmd}"
+              }
+            }
+          }
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.helm = {
+    enable = mkEnableOption "Helm language support";
+
+    treesitter = {
+      enable = mkEnableOption "Helm treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "helm";
+    };
+
+    lsp = {
+      enable = mkEnableOption "Helm LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        description = "Helm LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Helm LSP server package";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    {
+      # Enables filetype detection
+      vim.startPlugins = [pkgs.vimPlugins.vim-helm];
+    }
+  ]);
+}

modules/plugins/languages/php.nix

@@ -64,7 +64,7 @@
         }
       '';
     };
-    
+
     intelephense = {
       package = pkgs.intelephense;
       lspConfig = ''
@@ -72,15 +72,15 @@
           capabilities = capabilities,
           on_attach = default_on_attach,
           cmd = ${
-            if isList cfg.lsp.package
-            then expToLua cfg.lsp.package
-            else ''
-              {
-                "${getExe cfg.lsp.package}",
-                "--stdio"
-              },
-            ''
-          }
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {
+              "${getExe cfg.lsp.package}",
+              "--stdio"
+            },
+          ''
+        }
         }
       '';
     };

modules/plugins/languages/yaml.nix

@@ -14,14 +14,27 @@
 
   cfg = config.vim.languages.yaml;
 
+  onAttach =
+    if config.vim.languages.helm.lsp.enable
+    then ''
+      on_attach = function(client, bufnr)
+        local filetype = vim.bo[bufnr].filetype
+        if filetype == "helm" then
+          client.stop()
+        end
+      end''
+    else "on_attach = default_on_attach";
+
   defaultServer = "yaml-language-server";
   servers = {
     yaml-language-server = {
       package = pkgs.nodePackages.yaml-language-server;
       lspConfig = ''
+
+
         lspconfig.yamlls.setup {
-          capabilities = capabilities;
-          on_attach = default_on_attach;
+          capabilities = capabilities,
+          ${onAttach},
           cmd = ${
           if isList cfg.lsp.package
           then expToLua cfg.lsp.package