nixd: replace nixpkgs-fmt for nixfmt

nix-community · Aug 10, 2024 · fb9b136 · fb9b136
1 parent 5b5e4a4
commit fb9b136
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/default.nix b/default.nix
@@ -8,7 +8,6 @@
   meson,
   ninja,
   nix,
-  nixpkgs-fmt,
   pkg-config,
   nlohmann_json,
   python312,
@@ -29,10 +28,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  nativeCheckInputs = [
-    lit
-    nixpkgs-fmt
-  ];
+  nativeCheckInputs = [ lit ];
 
   buildInputs = [
     nix

diff --git a/flake.nix b/flake.nix
@@ -38,7 +38,6 @@
         };
         regressionDeps = with pkgs; [
           clang-tools
-          nixpkgs-fmt
           lit
         ];
         shellOverride = old: {
@@ -66,7 +65,7 @@
         devShells.nvim = pkgs.mkShell {
           nativeBuildInputs = [
             nixd
-            pkgs.nixpkgs-fmt
+            pkgs.nixfmt-rfc-style
             pkgs.git
             (import ./nixd/docs/editors/nvim-lsp.nix { inherit pkgs; })
           ];
@@ -105,7 +104,7 @@
         devShells.vscodium = pkgs.mkShell {
           nativeBuildInputs = [
             nixd
-            pkgs.nixpkgs-fmt
+            pkgs.nixfmt-rfc-style
             (import ./nixd/docs/editors/vscodium.nix { inherit pkgs; })
           ];
         };

diff --git a/nixd/docs/configuration.md b/nixd/docs/configuration.md
@@ -59,7 +59,7 @@ For vscode users you should write `settings.json`[^settings] like this:
         "nixd": {
             "formatting": {
                 // This is the default if ommited.
-                "command": [ "nixpkgs-fmt" ]
+                "command": [ "nixfmt" ]
             },
             "options": {
                 // By default, this entriy will be read from `import <nixpkgs> { }`
@@ -94,7 +94,7 @@ nvim_lsp.nixd.setup({
             expr = "import <nixpkgs> { }",
          },
          formatting = {
-            command = { "nixpkgs-fmt" },
+            command = { "nixfmt" },
          },
          options = {
             nixos = {
@@ -130,7 +130,7 @@ nvim_lsp.nixd.setup({
   },
   "formatting": {
     // Which command you would like to do formatting
-    "command": [ "nixpkgs-fmt" ]
+    "command": [ "nixfmt" ]
   },
   // Tell the language server your desired option set, for completion
   // This is lazily evaluated.

diff --git a/nixd/docs/editors/nvim-lsp.nix b/nixd/docs/editors/nvim-lsp.nix
@@ -368,7 +368,7 @@ let
                     expr = "import <nixpkgs> { }",
                 },
                 formatting = {
-                    command = { "nixpkgs-fmt" },
+                    command = { "nixfmt" },
                 },
                 options = {
                     nixos = {

diff --git a/nixd/docs/nixd-schema.json b/nixd/docs/nixd-schema.json
@@ -43,7 +43,7 @@
     "formatting": {
       "command": {
         "description": "Which command you would like to do formatting",
-        "default": "nixpkgs-fmt",
+        "default": "nixfmt",
         "type": "string"
       }
     },

diff --git a/nixd/include/nixd/Controller/Configuration.h b/nixd/include/nixd/Controller/Configuration.h
@@ -13,7 +13,7 @@ namespace nixd {
 // NOLINTBEGIN(readability-identifier-naming)
 struct Configuration {
   struct Formatting {
-    std::vector<std::string> command = {"nixpkgs-fmt"};
+    std::vector<std::string> command = {"nixfmt"};
   } formatting;
 
   struct OptionProvider {