NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-02-06 11:55:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

review mods

Browse source
This commit is contained in:
ppenguin 2026-01-16 15:57:01 +01:00
commit c7afc0c766
No known key found for this signature in database
GPG key ID: 7E7143B546BB17A7
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) bool enum listOf; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
@ -61,11 +61,7 @@ in {
}; };
format = { format = {
enable = mkOption { enable = mkEnableOption "Enable HCL formatting" // {default = config.vim.languages.enableFormat;};
type = bool;
default = config.vim.languages.enableFormat;
description = "Enable HCL formatting";
};
type = mkOption { type = mkOption {
type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats)); type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
default = defaultFormat; default = defaultFormat;

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

@ -4,11 +4,11 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames concatStringsSep; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) bool enum listOf; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
@ -57,16 +57,12 @@ in {
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum (attrNames servers));
default = defaultServers; default = defaultServers;
description = "Terraform LSP server to use (one or more of [${concatStringsSep " " (attrNames servers)}])"; description = "Terraform LSP server to use";
}; };
}; };
format = { format = {
enable = mkOption { enable = mkEnableOption "Enable Terraform formatting" // {default = config.vim.languages.enableFormat;};
type = bool;
default = config.vim.languages.enableFormat;
description = "Enable Terraform formatting";
};
type = mkOption { type = mkOption {
type = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats)); type = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats));
default = defaultFormat; default = defaultFormat;