From 6db298cb3f4628c7df5a75e9e6e39080b33bd6d1 Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Wed, 24 Dec 2025 11:32:04 +0100
Subject: [PATCH 01/12] terraform/hcl: improve options, fix terraform-cli
 error, add tofu-ls (free) as alternative option

- Add tofu(ls) as free terraform alternative for terraform and hcl
- Harmonize with other format/LSP implementation (also with conform)
- Add/fix terraform formatter
- Add `nomad fmt` as alternative hcl formatter

Note: for (nomad) hcl tofu/terraform ls are ineffective (don't support
e.g. jobspec schema) -> TODO: nomad-lsp (package and add, even though it
seems abandoned it's probably better for nomad/hcl)
---
 modules/plugins/languages/hcl.nix       | 48 ++++++++++----
 modules/plugins/languages/terraform.nix | 86 ++++++++++++++++++++-----
 2 files changed, 105 insertions(+), 29 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index e32719b9..db24b116 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -4,24 +4,31 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
+  inherit (builtins) attrNames elem;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf mkMerge mkDefault;
   inherit (lib.types) bool enum listOf;
   inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.hcl;
 
-  defaultServers = ["terraform-ls"];
+  defaultServers = ["tofuls"];
   servers = {
-    terraform-ls = {
+    terraformls = {
       enable = true;
-      cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
+      cmd = mkDefault [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      filetypes = ["hcl"];
+      root_markers = [".git"];
+    };
+    tofuls = {
+      enable = true;
+      cmd = mkDefault [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      filetypes = ["hcl"];
       root_markers = [".terraform" ".git"];
     };
+    # TODO: package nomad-lsp and offer as an option here too
   };
 
   defaultFormat = ["hclfmt"];
@@ -29,18 +36,25 @@
     hclfmt = {
       command = getExe pkgs.hclfmt;
     };
+    nomad-fmt = {
+      command = getExe pkgs.nomad;
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
   };
 in {
   options.vim.languages.hcl = {
     enable = mkEnableOption "HCL support";
 
     treesitter = {
-      enable = mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable =
+        mkEnableOption "HCL treesitter" // {default = 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;};
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -81,18 +95,24 @@ in {
           .set('hcl', '#%s')
       '';
     }
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim = {
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
+        extraPackages =
+          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
+          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
+      };
     })
 
     (mkIf cfg.format.enable {
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 5f3952df..28cc2617 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -4,44 +4,80 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
+  inherit (builtins) attrNames concatStringsSep elem;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum listOf;
-  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.types) bool enum listOf;
+  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.terraform;
 
-  defaultServers = ["terraformls"];
+  defaultServers = ["tofuls"];
   servers = {
     terraformls = {
       enable = true;
       cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
+      filetypes = ["terraform" "terraform-vars" "tf"];
       root_markers = [".terraform" ".git"];
     };
+    tofuls = {
+      enable = true;
+      cmd = [(getExe pkgs.tofu-ls) "serve"];
+      filetypes = ["terraform" "terraform-vars" "tf"];
+      root_markers = [".terraform" ".git"];
+    };
+  };
+
+  defaultFormat = ["tofu-fmt"];
+  formats = {
+    tofu-fmt = {
+      command = "${getExe pkgs.opentofu}";
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
+    terraform-fmt = {
+      command = "${getExe pkgs.terraform}";
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
   };
 in {
   options.vim.languages.terraform = {
-    enable = mkEnableOption "Terraform/HCL support";
+    enable = mkEnableOption "Terraform support";
 
     treesitter = {
-      enable = mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable =
+        mkEnableOption "Terraform treesitter" // {default = 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;};
 
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
-        description = "Terraform LSP server to use";
+        description = "Terraform LSP server to use (one or more of [${concatStringsSep " " (attrNames servers)}])";
+      };
+    };
+
+    format = {
+      enable = mkOption {
+        type = bool;
+        default = config.vim.languages.enableFormat;
+        description = "Enable Terraform formatting";
+      };
+      type = mkOption {
+        type = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats));
+        default = defaultFormat;
+        description = "Terraform formatter to use";
       };
     };
   };
+
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
@@ -49,12 +85,32 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim = {
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
+        extraPackages =
+          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
+          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
+      };
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.terraform = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
     })
   ]);
 }

From d28ebedc52284c27ec71df674559dd04ef23226e Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Wed, 7 Jan 2026 18:41:35 +0100
Subject: [PATCH 02/12] update release notes

---
 docs/manual/release-notes/rl-0.9.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 612e473d..2f282326 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -36,3 +36,11 @@
 [Libadoxon](https://github.com/Libadoxon):
 
 - `toggleterm` open map now also works when in terminal mode
+
+[ppenguin](https://github.com/Libadoxon):
+
+- Improved/harmonized for `terraform` and `hcl`:
+  - formatting (use `terraform fmt` or `tofu fmt` for `tf` files)
+  - LSP config
+  - Added `tofu` and `tofu-ls` as (free) alternative to `terrraform` and
+    `terraform-ls`

From 6a8325639fe2f63cae1cda76506495d951dac65b Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Fri, 9 Jan 2026 10:05:53 +0100
Subject: [PATCH 03/12] changes from review

---
 modules/plugins/languages/hcl.nix       | 19 +++++++------------
 modules/plugins/languages/terraform.nix | 16 +++++-----------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index db24b116..529cc44e 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -14,17 +14,17 @@
 
   cfg = config.vim.languages.hcl;
 
-  defaultServers = ["tofuls"];
+  defaultServers = ["tofuls-hcl"];
   servers = {
-    terraformls = {
+    terraformls-hcl = {
       enable = true;
-      cmd = mkDefault [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
       filetypes = ["hcl"];
       root_markers = [".git"];
     };
-    tofuls = {
+    tofuls-hcl = {
       enable = true;
-      cmd = mkDefault [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
       filetypes = ["hcl"];
       root_markers = [".terraform" ".git"];
     };
@@ -47,14 +47,12 @@ in {
     enable = mkEnableOption "HCL support";
 
     treesitter = {
-      enable =
-        mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable = mkEnableOption "HCL treesitter" // {default = 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;};
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -109,9 +107,6 @@ in {
             value = servers.${n};
           })
           cfg.lsp.servers;
-        extraPackages =
-          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
-          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
       };
     })
 
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 28cc2617..4d91cf12 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -14,15 +14,15 @@
 
   cfg = config.vim.languages.terraform;
 
-  defaultServers = ["tofuls"];
+  defaultServers = ["tofuls-tf"];
   servers = {
-    terraformls = {
+    terraformls-tf = {
       enable = true;
       cmd = [(getExe pkgs.terraform-ls) "serve"];
       filetypes = ["terraform" "terraform-vars" "tf"];
       root_markers = [".terraform" ".git"];
     };
-    tofuls = {
+    tofuls-tf = {
       enable = true;
       cmd = [(getExe pkgs.tofu-ls) "serve"];
       filetypes = ["terraform" "terraform-vars" "tf"];
@@ -48,15 +48,12 @@ in {
     enable = mkEnableOption "Terraform support";
 
     treesitter = {
-      enable =
-        mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable = mkEnableOption "Terraform treesitter" // {default = 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;};
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -92,9 +89,6 @@ in {
             value = servers.${n};
           })
           cfg.lsp.servers;
-        extraPackages =
-          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
-          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
       };
     })
 

From 02369b06b80b79bbfd0f41ab651f2de097987cb3 Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Fri, 9 Jan 2026 10:23:20 +0100
Subject: [PATCH 04/12] remove obsolete comments and unused functions

---
 modules/plugins/languages/hcl.nix       | 8 ++++----
 modules/plugins/languages/terraform.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index 529cc44e..567e1630 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -4,10 +4,10 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames elem;
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
-  inherit (lib.modules) mkIf mkMerge mkDefault;
+  inherit (lib.modules) mkIf mkMerge;
   inherit (lib.types) bool enum listOf;
   inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
@@ -18,13 +18,13 @@
   servers = {
     terraformls-hcl = {
       enable = true;
-      cmd = [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.terraform-ls) "serve"];
       filetypes = ["hcl"];
       root_markers = [".git"];
     };
     tofuls-hcl = {
       enable = true;
-      cmd = [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.tofu-ls) "serve"];
       filetypes = ["hcl"];
       root_markers = [".terraform" ".git"];
     };
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 4d91cf12..8d3d50a3 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames concatStringsSep elem;
+  inherit (builtins) attrNames concatStringsSep;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;

From c7afc0c766a8270e815b11ec4ab3734ef975aa2f Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Fri, 16 Jan 2026 15:57:01 +0100
Subject: [PATCH 05/12] review mods

---
 modules/plugins/languages/hcl.nix       |  8 ++------
 modules/plugins/languages/terraform.nix | 12 ++++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index 567e1630..9e672396 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -8,7 +8,7 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   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.attrsets) mapListToAttrs;
 
@@ -61,11 +61,7 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        type = bool;
-        default = config.vim.languages.enableFormat;
-        description = "Enable HCL formatting";
-      };
+      enable = mkEnableOption "Enable HCL formatting" // {default = config.vim.languages.enableFormat;};
       type = mkOption {
         type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
         default = defaultFormat;
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 8d3d50a3..0056456a 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -4,11 +4,11 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames concatStringsSep;
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) bool enum listOf;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
@@ -57,16 +57,12 @@ in {
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
-        description = "Terraform LSP server to use (one or more of [${concatStringsSep " " (attrNames servers)}])";
+        description = "Terraform LSP server to use";
       };
     };
 
     format = {
-      enable = mkOption {
-        type = bool;
-        default = config.vim.languages.enableFormat;
-        description = "Enable Terraform formatting";
-      };
+      enable = mkEnableOption "Enable Terraform formatting" // {default = config.vim.languages.enableFormat;};
       type = mkOption {
         type = deprecatedSingleOrListOf "vim.language.terraform.format.type" (enum (attrNames formats));
         default = defaultFormat;

From fd2827d79044c66e5efc4b0ebfd94aa341b0f473 Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Sat, 24 Jan 2026 12:17:15 +0100
Subject: [PATCH 06/12] Add default LSP change for terraform and hcl to
 breaking changes in rl.

---
 docs/manual/release-notes/rl-0.9.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 9de10149..e5c8833d 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -19,11 +19,14 @@
     ];
   }
   ```
+- `languages.{terraform,hcl}`: LSP servers now default to `tofu-ls`. While this
+  is unlikely to cause any noticeable change in behavior or breakage, it's
+  mentioned just in case.
 
-  Some other settings and commands are now deprecated but are still supported.
+Some other settings and commands are now deprecated but are still supported.
 
-  - The `setupOpts.mappings` options were also removed. Use the built-in Neovim
-    settings (nvf's {option}`vim.keymaps`)
+- The `setupOpts.mappings` options were also removed. Use the built-in Neovim
+  settings (nvf's {option}`vim.keymaps`)
 
 ## Changelog {#sec-release-0-9-changelog}
 
@@ -67,7 +70,7 @@
 
 - `toggleterm` open map now also works when in terminal mode
 
-[ppenguin](https://github.com/Libadoxon):
+[ppenguin](https://github.com/ppenguin):
 
 - Improved/harmonized for `terraform` and `hcl`:
   - formatting (use `terraform fmt` or `tofu fmt` for `tf` files)

From 89ad433fd14c7cea8371544dc905a039c3ef316f Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Tue, 17 Mar 2026 12:16:20 +0100
Subject: [PATCH 07/12] harmonize/fix format option [hcl,terraform]

---
 modules/plugins/languages/hcl.nix       |  2 +-
 modules/plugins/languages/terraform.nix | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

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";
       };

From d03d8d78dd8fc93cf9cb87b263fe46508b26df27 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Tue, 17 Mar 2026 15:08:39 -0400
Subject: [PATCH 08/12] docs: fix obsidian breaking change bisection

---
 docs/manual/release-notes/rl-0.9.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index a219f902..a82c9667 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -20,15 +20,16 @@
     ];
   }
   ```
+
+  Some other settings and commands are now deprecated but are still supported.
+
+  - The `setupOpts.mappings` options were also removed. Use the built-in Neovim
+    settings (nvf's {option}`vim.keymaps`)
+
 - `languages.{terraform,hcl}`: LSP servers now default to `tofu-ls`. While this
   is unlikely to cause any noticeable change in behavior or breakage, it's
   mentioned just in case.
 
-Some other settings and commands are now deprecated but are still supported.
-
-- The `setupOpts.mappings` options were also removed. Use the built-in Neovim
-  settings (nvf's {option}`vim.keymaps`)
-
 [Snoweuph](https://github.com/snoweuph)
 
 - "Correct `languages.go.treesitter` to contain all Go file types.

From ef0e10f591402cb9fad3e4f0faa8f66162655c04 Mon Sep 17 00:00:00 2001
From: midischwarz12 <midischwarz@proton.me>
Date: Mon, 16 Mar 2026 16:30:15 -0500
Subject: [PATCH 09/12] prettier-plugin-astro: set HOME in build to avoid pnpm
 hook failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Export HOME=$TMPDIR in preConfigure so pnpm config doesn’t fail on /homeless-shelter
---
 docs/manual/release-notes/rl-0.9.md                  | 5 +++++
 flake/pkgs/by-name/prettier-plugin-astro/package.nix | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index a82c9667..c792df75 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -57,6 +57,11 @@
 
 ## Changelog {#sec-release-0-9-changelog}
 
+[midischwarz12](https://github.com/midischwarz12):
+
+- Changed the prettier-plugin-astro build to use `writableTmpDirAsHomeHook` to
+  avoid pnpm hook failures in sandboxed builds.
+
 [taylrfnt](https://github.com/taylrfnt)
 
 - Introduce a `darwinModule` option for Darwin users. The ergonomics of
diff --git a/flake/pkgs/by-name/prettier-plugin-astro/package.nix b/flake/pkgs/by-name/prettier-plugin-astro/package.nix
index 0c0d206f..882718a0 100644
--- a/flake/pkgs/by-name/prettier-plugin-astro/package.nix
+++ b/flake/pkgs/by-name/prettier-plugin-astro/package.nix
@@ -6,6 +6,7 @@
   pnpmConfigHook,
   fetchPnpmDeps,
   pins,
+  writableTmpDirAsHomeHook,
 }: let
   pin = pins.prettier-plugin-astro;
 in
@@ -28,6 +29,7 @@ in
 
     nativeBuildInputs = [
       nodejs
+      writableTmpDirAsHomeHook
       (pnpmConfigHook.overrideAttrs {
         propagatedBuildInputs = [pnpm_9];
       })

From 046afc8b3e7a5b0f668ef2dc1b8b904e5b892435 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 19:53:18 +0000
Subject: [PATCH 10/12] build(deps): bump cachix/cachix-action from 16 to 17

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v16...v17)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-version: '17'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/cachix.yml | 2 +-
 .github/workflows/check.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 43d79f15..872e0940 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -32,7 +32,7 @@ jobs:
             substituters = https://cache.nixos.org/ https://feel-co.cachix.org
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
 
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/cachix-action@v17
         with:
           authToken: ${{ secrets.CACHIX_TOKEN }}
           extraPullNames: nix-community
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 944386eb..95f87724 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -100,7 +100,7 @@ jobs:
             substituters = https://cache.nixos.org/ https://feel-co.cachix.org
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
 
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/cachix-action@v17
         with:
           authToken: ${{ secrets.CACHIX_TOKEN }}
           extraPullNames: nix-community

From 68b7df5065e14edf15464eb3d50cb02d599d223a Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Thu, 19 Mar 2026 12:36:51 +0000
Subject: [PATCH 11/12] treesitter: make foldenable configurable

---
 docs/manual/release-notes/rl-0.9.md       | 10 +++++++---
 modules/plugins/treesitter/config.nix     |  6 ++----
 modules/plugins/treesitter/treesitter.nix |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index c792df75..0bea2b95 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -22,7 +22,6 @@
   ```
 
   Some other settings and commands are now deprecated but are still supported.
-
   - The `setupOpts.mappings` options were also removed. Use the built-in Neovim
     settings (nvf's {option}`vim.keymaps`)
 
@@ -35,7 +34,6 @@
 - "Correct `languages.go.treesitter` to contain all Go file types.
   `languages.go.treesitter.package` is now `languages.go.treesitter.goPackage`.
   New are:
-
   - `languages.go.treesitter.goPackage`.
 
   - `languages.go.treesitter.gomodPackage`.
@@ -70,7 +68,7 @@
   following:
 
   ```shell
-  (class: "nixos") cannot be imported into a module 
+  (class: "nixos") cannot be imported into a module
   evaluation that expects class "darwin".
   ```
 
@@ -165,7 +163,9 @@
       - Mappings are now expected to be set using the built-in Neovim APIs,
         managed by `vim.keymaps` in nvf, instead of `mappings` options.
       - Some option defaults have changed.
+
     - And more.
+
   - Automatically configure an enabled picker in the order mentioned above, if
     any are enabled.
   - Add integration with `snacks.image` for rendering workspace/vault assets.
@@ -318,4 +318,8 @@ https://github.com/gorbit99/codewindow.nvim
 
 - Fix `vim.formatter.conform-nvim.setupOpts.formatters` type for correct merging
 
+[tlvince](https://github.com/tlvince):
+
+- Added configuration option for `foldenable`
+
 <!-- vim: set textwidth=80: -->
diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index 899e7c19..e1bbc3c4 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -6,6 +6,7 @@
   inherit (lib.modules) mkIf;
   inherit (lib.lists) optionals;
   inherit (lib.nvim.dag) entryAfter;
+  inherit (lib.trivial) boolToString;
 
   cfg = config.vim.treesitter;
 in {
@@ -54,10 +55,7 @@ in {
             callback = function()
               vim.wo[0][0].foldmethod = "expr"
               vim.wo[0][0].foldexpr = "v:lua.vim.treesitter.foldexpr()"
-              -- This is optional, but is set rather as a sane default.
-              -- If unset, opened files will be folded by automatically as
-              -- the files are opened
-              vim.o.foldenable = false
+              vim.o.foldenable = ${boolToString cfg.foldByDefault}
             end,
           })
         ''}
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index c2039a9f..dd62e750 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -10,6 +10,7 @@ in {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";
 
     fold = mkEnableOption "fold with treesitter";
+    foldByDefault = mkEnableOption "folding by default when a file is opened";
     autotagHtml = mkEnableOption "autoclose and rename html tag";
 
     grammars = mkOption {

From 73f656547464b5f90d87ea69536440375924cd48 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 19 Mar 2026 22:03:22 +0100
Subject: [PATCH 12/12] treesitter: remove foldByDefault

---
 docs/manual/release-notes/rl-0.9.md       | 4 ++++
 modules/extra/deprecations.nix            | 5 +++++
 modules/plugins/treesitter/config.nix     | 2 --
 modules/plugins/treesitter/treesitter.nix | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 0bea2b95..e5b2652d 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -29,6 +29,10 @@
   is unlikely to cause any noticeable change in behavior or breakage, it's
   mentioned just in case.
 
+- `vim.treesitter.foldByDefault` is removed. Folding behavior should be
+  controlled via `vim.options.foldenable` directly instead. RIP
+  `vim.treesitter.foldByDefault` 2026-03-19 - 2026-03-19.
+
 [Snoweuph](https://github.com/snoweuph)
 
 - "Correct `languages.go.treesitter` to contain all Go file types.
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 76d258bd..1572f249 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -342,5 +342,10 @@ in {
         Incremental selection configuration has been removed from nvim-treesitter.
       '')
     ]
+
+    # 2026-03-19
+    [
+      (mkRenamedOptionModule ["vim" "treesitter" "foldByDefault"] ["vim" "options" "foldenable"])
+    ]
   ];
 }
diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index e1bbc3c4..1ca628b0 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -6,7 +6,6 @@
   inherit (lib.modules) mkIf;
   inherit (lib.lists) optionals;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.trivial) boolToString;
 
   cfg = config.vim.treesitter;
 in {
@@ -55,7 +54,6 @@ in {
             callback = function()
               vim.wo[0][0].foldmethod = "expr"
               vim.wo[0][0].foldexpr = "v:lua.vim.treesitter.foldexpr()"
-              vim.o.foldenable = ${boolToString cfg.foldByDefault}
             end,
           })
         ''}
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index dd62e750..c2039a9f 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -10,7 +10,6 @@ in {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";
 
     fold = mkEnableOption "fold with treesitter";
-    foldByDefault = mkEnableOption "folding by default when a file is opened";
     autotagHtml = mkEnableOption "autoclose and rename html tag";
 
     grammars = mkOption {