diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index 9fde3d8a..fe4a389e 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -78,7 +78,7 @@ in {
           defaultText = literalExpression "config.vim.languages.enableFormat";
         };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
+        type = listOf (enum (attrNames formats));
         default = defaultFormat;
         description = "HCL formatter to use";
       };
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 4910fdbd..fbcc77da 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -64,7 +64,6 @@ in {
           default = config.vim.lsp.enable;
           defaultText = literalExpression "config.vim.lsp.enable";
         };
-
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -73,9 +72,14 @@ in {
     };
 
     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 = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats));
+        type = listOf (enum (attrNames formats));
         default = defaultFormat;
         description = "Terraform formatter to use";
       };