From a54dc76af16dd6371ea11107c76aa3f42723b1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 16:47:54 +0200 Subject: [PATCH] switch to nixfmt from nixpkgs-fmt --- pkgs/editor/clan-edit-codium.nix | 4 ++-- pkgs/editor/settings.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/editor/clan-edit-codium.nix b/pkgs/editor/clan-edit-codium.nix index d85ea11ba..3f1c7bb94 100644 --- a/pkgs/editor/clan-edit-codium.nix +++ b/pkgs/editor/clan-edit-codium.nix @@ -3,7 +3,7 @@ coreutils, nil, nixd, - nixpkgs-fmt, + nixfmt-rfc-style, direnv, vscode-extensions, vscode-with-extensions, @@ -25,7 +25,7 @@ writeShellApplication { coreutils nil nixd - nixpkgs-fmt + nixfmt-rfc-style direnv ]; text = '' diff --git a/pkgs/editor/settings.json b/pkgs/editor/settings.json index eba9bba8b..0dbc48065 100644 --- a/pkgs/editor/settings.json +++ b/pkgs/editor/settings.json @@ -2,11 +2,11 @@ "security.workspace.trust.enabled": false, "nix.enableLanguageServer": true, "nix.serverPath": "nixd", - "nix.formatterPath": "nixpkgs-fmt", + "nix.formatterPath": "nixfmt", "nix.serverSettings": { "nixd": { "formatting": { - "command": "nixpkgs-fmt" + "command": "nixfmt" }, "options": { "nixos": {