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 diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 818f264c..90bbe56a 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -22,16 +22,22 @@ ``` 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. + +- `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. `languages.go.treesitter.package` is now `languages.go.treesitter.goPackage`. New are: - - `languages.go.treesitter.goPackage`. - `languages.go.treesitter.gomodPackage`. @@ -53,6 +59,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 @@ -61,7 +72,7 @@ following: ```shell - (class: "nixos") cannot be imported into a module + (class: "nixos") cannot be imported into a module evaluation that expects class "darwin". ``` @@ -99,6 +110,14 @@ - `toggleterm` open map now also works when in terminal mode +[ppenguin](https://github.com/ppenguin): + +- 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` + [jtliang24](https://github.com/jtliang24): - Updated nix language plugin to use pkgs.nixfmt instead of @@ -148,7 +167,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. @@ -305,4 +326,8 @@ https://github.com/gorbit99/codewindow.nvim - Updated codecompanion-nvim adapters to allow specifying a model. +[tlvince](https://github.com/tlvince): + +- Added configuration option for `foldenable` + 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]; }) 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/languages/hcl.nix b/modules/plugins/languages/hcl.nix index ea125f1b..fe4a389e 100644 --- a/modules/plugins/languages/hcl.nix +++ b/modules/plugins/languages/hcl.nix @@ -8,20 +8,27 @@ inherit (lib.options) mkEnableOption mkOption literalExpression; 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; cfg = config.vim.languages.hcl; - defaultServers = ["terraform-ls"]; + defaultServers = ["tofuls-hcl"]; servers = { - terraform-ls = { + terraformls-hcl = { enable = true; cmd = [(getExe pkgs.terraform-ls) "serve"]; - filetypes = ["terraform" "terraform-vars"]; + filetypes = ["hcl"]; + root_markers = [".git"]; + }; + tofuls-hcl = { + enable = true; + cmd = [(getExe pkgs.tofu-ls) "serve"]; + filetypes = ["hcl"]; root_markers = [".terraform" ".git"]; }; + # TODO: package nomad-lsp and offer as an option here too }; defaultFormat = ["hclfmt"]; @@ -29,6 +36,11 @@ hclfmt = { command = getExe pkgs.hclfmt; }; + nomad-fmt = { + command = getExe pkgs.nomad; + args = ["fmt" "$FILENAME"]; + stdin = false; + }; }; in { options.vim.languages.hcl = { @@ -66,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"; }; @@ -97,18 +109,21 @@ in { } ''; } + (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; + }; }) (mkIf cfg.format.enable { diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix index 43a82e45..fbcc77da 100644 --- a/modules/plugins/languages/terraform.nix +++ b/modules/plugins/languages/terraform.nix @@ -9,23 +9,43 @@ inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum listOf; - inherit (lib.nvim.types) mkGrammarOption; + inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.attrsets) mapListToAttrs; cfg = config.vim.languages.terraform; - defaultServers = ["terraformls"]; + defaultServers = ["tofuls-tf"]; servers = { - terraformls = { + terraformls-tf = { enable = true; cmd = [(getExe pkgs.terraform-ls) "serve"]; - filetypes = ["terraform" "terraform-vars"]; + filetypes = ["terraform" "terraform-vars" "tf"]; root_markers = [".terraform" ".git"]; }; + tofuls-tf = { + 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 = @@ -44,14 +64,28 @@ in { default = config.vim.lsp.enable; defaultText = literalExpression "config.vim.lsp.enable"; }; - servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; description = "Terraform LSP server to use"; }; }; + + format = { + enable = + mkEnableOption "Enable Terraform formatting" + // { + default = config.vim.languages.enableFormat; + defaultText = literalExpression "config.vim.languages.enableFormat"; + }; + type = mkOption { + type = listOf (enum (attrNames formats)); + default = defaultFormat; + description = "Terraform formatter to use"; + }; + }; }; + config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { vim.treesitter.enable = true; @@ -59,12 +93,29 @@ 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; + }; + }) + + (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; + }; + }; }) ]); } diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix index 899e7c19..1ca628b0 100644 --- a/modules/plugins/treesitter/config.nix +++ b/modules/plugins/treesitter/config.nix @@ -54,10 +54,6 @@ 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 end, }) ''}