Merge branch 'main' into improve-terraformls

This commit is contained in:
ppenguin 2026-03-16 14:47:35 +01:00 committed by GitHub
commit 625f2c0fd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 1370 additions and 233 deletions

View file

@ -5,7 +5,7 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib.types) enum listOf;
@ -48,12 +48,23 @@ in {
enable = mkEnableOption "Terraform support";
treesitter = {
enable = mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
enable =
mkEnableOption "Terraform treesitter"
// {
default = config.vim.languages.enableTreesitter;
defaultText = literalExpression "config.vim.languages.enableTreesitter";
};
package = mkGrammarOption pkgs "terraform";
};
lsp = {
enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
enable =
mkEnableOption "Terraform LSP support (terraform-ls)"
// {
default = config.vim.lsp.enable;
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
type = listOf (enum (attrNames servers));
default = defaultServers;