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

harmonize/fix format option [hcl,terraform]

Browse source
This commit is contained in:
ppenguin 2026-03-17 12:16:20 +01:00
commit 89ad433fd1
No known key found for this signature in database
GPG key ID: 7E7143B546BB17A7
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ in {
defaultText = literalExpression "config.vim.languages.enableFormat"; defaultText = literalExpression "config.vim.languages.enableFormat";
}; };
type = mkOption { type = mkOption {
type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats)); type = listOf (enum (attrNames formats));
default = defaultFormat; default = defaultFormat;
description = "HCL formatter to use"; description = "HCL formatter to use";
}; };

10
modules/plugins/languages/terraform.nix
View file

@ -64,7 +64,6 @@ in {
default = config.vim.lsp.enable; default = config.vim.lsp.enable;
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum (attrNames servers));
default = defaultServers; default = defaultServers;
@ -73,9 +72,14 @@ in {
}; };
format = { format = {
enable = mkEnableOption "Enable Terraform formatting" // {default = config.vim.languages.enableFormat;}; enable =
mkEnableOption "Enable Terraform formatting"
// {
default = config.vim.languages.enableFormat;
defaultText = literalExpression "config.vim.languages.enableFormat";
};
type = mkOption { type = mkOption {
type = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats)); type = listOf (enum (attrNames formats));
default = defaultFormat; default = defaultFormat;
description = "Terraform formatter to use"; description = "Terraform formatter to use";
}; };