NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-03-21 11:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into improve-terraformls

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
modules/plugins/languages/hcl.nix
View file

@ -5,7 +5,7 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
@ -47,12 +47,22 @@ in {
enable = mkEnableOption "HCL support";
treesitter = {
enable = mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
enable =
mkEnableOption "HCL treesitter"
// {
default = config.vim.languages.enableTreesitter;
defaultText = literalExpression "config.vim.languages.enableTreesitter";
};
package = mkGrammarOption pkgs "hcl";
};
lsp = {
enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
enable =
mkEnableOption "HCL LSP support"
// {
default = config.vim.lsp.enable;
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
type = listOf (enum (attrNames servers));
default = defaultServers;
@ -61,7 +71,12 @@ in {
};
format = {
enable = mkEnableOption "Enable HCL formatting" // {default = config.vim.languages.enableFormat;};
enable =
mkEnableOption "HCL formatting"
// {
default = config.vim.languages.enableFormat;
defaultText = literalExpression "config.vim.languages.enableFormat";
};
type = mkOption {
type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
default = defaultFormat;