diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index 49e99df7..9d186d32 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -68,19 +68,9 @@ everyone. As part of the autocompletion rewrite, modules that used to use a `type` option have been replaced by per-plugin modules instead. Since both modules only had one type, you can simply change - - `vim.autocomplete.*` -> `vim.autocomplete.nvim-cmp.*` - `vim.autopairs.enable` -> `vim.autopairs.nvim-autopairs.enable` -### `nixpkgs-fmt` removed in favor of `nixfmt` {#sec-nixpkgs-fmt-deprecation} - -`nixpkgs-fmt` has been archived for a while, and it's finally being removed in -favor of nixfmt (more information can be found -[here](https://github.com/nix-community/nixpkgs-fmt?tab=readme-ov-file#nixpkgs-fmt---nix-code-formatter-for-nixpkgs). - -To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to -`nixfmt`. - ## Changelog {#sec-release-0.7-changelog} [ItsSorae](https://github.com/ItsSorae): @@ -230,7 +220,8 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to `vim.languages.ts.extensions.ts-error-translator` to aid with Typescript development. -- Add [neo-tree.nvim] as an alternative file-tree plugin. It will be available under `vim.filetree.neo-tree`, similar to nvimtree. +- Add [neo-tree.nvim] as an alternative file-tree plugin. It will be available + under `vim.filetree.neo-tree`, similar to nvimtree. - Add `nvf-print-config` & `nvf-print-config-path` helper scripts to Neovim closure. Both of those scripts have been automatically added to your PATH upon @@ -295,7 +286,3 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to - Add LSP support for Scala via [nvim-metals](https://github.com/scalameta/nvim-metals) -[nezia1](https://github.com/nezia1): - -- Add [biome](https://github.com/biomejs/biome) support for Typescript, CSS and Svelte. Enable them via [](#opt-vim.languages.ts.format.type), [](#opt-vim.languages.css.format.type) and [](#opt-vim.languages.svelte.format.type) respectively. -- Replace [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) with [nixfmt](https://github.com/NixOS/nixfmt) (nixfmt-rfc-style). diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix index 8330a41a..1535ecaf 100644 --- a/modules/plugins/languages/css.nix +++ b/modules/plugins/languages/css.nix @@ -63,18 +63,6 @@ ) ''; }; - - biome = { - package = pkgs.biome; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.biome.with({ - command = "${cfg.format.package}/bin/biome", - }) - ) - ''; - }; }; in { options.vim.languages.css = { diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 82dded69..6cf1f90b 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -5,7 +5,6 @@ ... }: let inherit (builtins) attrNames; - inherit (lib) concatStringsSep; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; @@ -63,10 +62,10 @@ command = {"${cfg.format.package}/bin/alejandra", "--quiet"}, }, ''} - ${optionalString (cfg.format.type == "nixfmt") + ${optionalString (cfg.format.type == "nixpkgs-fmt") '' formatting = { - command = {"${cfg.format.package}/bin/nixfmt"}, + command = {"${cfg.format.package}/bin/nixpkgs-fmt"}, }, ''} }, @@ -91,19 +90,10 @@ ''; }; - nixfmt = { - package = pkgs.nixfmt-rfc-style; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.nixfmt.with({ - command = "${cfg.format.package}/bin/nixfmt" - }) - ) - ''; + nixpkgs-fmt = { + package = pkgs.nixpkgs-fmt; + # Never need to use null-ls for nixpkgs-fmt }; - - nixpkgs-fmt = null; # removed }; defaultDiagnosticsProvider = ["statix" "deadnix"]; @@ -185,12 +175,6 @@ in { config = mkIf cfg.enable (mkMerge [ { - assertions = [ - { - assertion = cfg.format.type != "nixpkgs-fmt"; - message = "nixpkgs-fmt has been archived upstream. Please use one of the following instead: ${concatStringsSep ", " (attrNames formats)}"; - } - ]; vim.pluginRC.nix = '' vim.api.nvim_create_autocmd("FileType", { pattern = "nix", diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index a3c55e10..e6c9d621 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -48,18 +48,6 @@ ) ''; }; - - biome = { - package = pkgs.biome; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.biome.with({ - command = "${cfg.format.package}/bin/biome", - }) - ) - ''; - }; }; # TODO: specify packages diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 726950ef..5ceccecf 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -95,18 +95,6 @@ ) ''; }; - - biome = { - package = pkgs.biome; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.biome.with({ - command = "${cfg.format.package}/bin/biome", - }) - ) - ''; - }; }; # TODO: specify packages