diff --git a/README.md b/README.md index 6db7a6c4..44ea3568 100644 --- a/README.md +++ b/README.md @@ -281,8 +281,7 @@ You can view this list in vim with `:help conform-formatters` - [mix](https://hexdocs.pm/mix/main/Mix.Tasks.Format.html) - Format Elixir files using the mix format command. - [nickel](https://nickel-lang.org/) - Code formatter for the Nickel programming language. - [nimpretty](https://github.com/nim-lang/nim) - nimpretty is a Nim source code beautifier that follows the official style guide. -- [nixfmt](https://github.com/serokell/nixfmt) - nixfmt is a formatter for Nix code, intended to apply a uniform style. -- [nixfmt-rfc-style](https://github.com/NixOS/nixfmt) - The official (but not yet stable) formatter for Nix code. +- [nixfmt](https://github.com/NixOS/nixfmt) - The official (but not yet stable) formatter for Nix code. - [nixpkgs_fmt](https://github.com/nix-community/nixpkgs-fmt) - nixpkgs-fmt is a Nix code formatter for nixpkgs. - [npm-groovy-lint](https://github.com/nvuillam/npm-groovy-lint) - Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files using command line. - [ocamlformat](https://github.com/ocaml-ppx/ocamlformat) - Auto-formatter for OCaml code. diff --git a/doc/conform.txt b/doc/conform.txt index 404fa14d..978a63a2 100644 --- a/doc/conform.txt +++ b/doc/conform.txt @@ -391,9 +391,7 @@ FORMATTERS *conform-formatter `nickel` - Code formatter for the Nickel programming language. `nimpretty` - nimpretty is a Nim source code beautifier that follows the official style guide. -`nixfmt` - nixfmt is a formatter for Nix code, intended to apply a uniform - style. -`nixfmt-rfc-style` - The official (but not yet stable) formatter for Nix code. +`nixfmt` - The official (but not yet stable) formatter for Nix code. `nixpkgs_fmt` - nixpkgs-fmt is a Nix code formatter for nixpkgs. `npm-groovy-lint` - Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files using command line. diff --git a/lua/conform/formatters/nixfmt-rfc-style.lua b/lua/conform/formatters/nixfmt-rfc-style.lua deleted file mode 100644 index f89a971c..00000000 --- a/lua/conform/formatters/nixfmt-rfc-style.lua +++ /dev/null @@ -1,8 +0,0 @@ ----@type conform.FileFormatterConfig -return { - meta = { - url = "https://github.com/NixOS/nixfmt", - description = "The official (but not yet stable) formatter for Nix code", - }, - command = "nixfmt", -} diff --git a/lua/conform/formatters/nixfmt.lua b/lua/conform/formatters/nixfmt.lua index 27029d51..f89a971c 100644 --- a/lua/conform/formatters/nixfmt.lua +++ b/lua/conform/formatters/nixfmt.lua @@ -1,8 +1,8 @@ ---@type conform.FileFormatterConfig return { meta = { - url = "https://github.com/serokell/nixfmt", - description = "nixfmt is a formatter for Nix code, intended to apply a uniform style.", + url = "https://github.com/NixOS/nixfmt", + description = "The official (but not yet stable) formatter for Nix code", }, command = "nixfmt", }