nixfmt: rfc-style name is deprecated

also updated the treefmt flake:
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4' (2025-11-12)
  → 'github:numtide/treefmt-nix/f46bb205f239b415309f58166f8df6919fa88377' (2026-01-25)

nixfmt: rfc-style name is deprecated

also updated the treefmt flake:
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4' (2025-11-12)
  → 'github:numtide/treefmt-nix/f46bb205f239b415309f58166f8df6919fa88377' (2026-01-25)
This commit is contained in:
Trolli Schmittlauch 2026-01-27 10:56:59 +01:00
parent ca479db8be
commit 75062d5568
4 changed files with 6 additions and 6 deletions

6
flake.lock generated
View file

@ -359,11 +359,11 @@
]
},
"locked": {
"lastModified": 1762938485,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
"lastModified": 1769353635,
"narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
"rev": "f46bb205f239b415309f58166f8df6919fa88377",
"type": "github"
},
"original": {

View file

@ -51,7 +51,7 @@
merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt`
mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
cmd = "${lib.getExe pkgs.nixfmt} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true;
};
core.excludesfile = toString (

View file

@ -90,7 +90,7 @@ let
nixHelpers = [
nixpkgs-review
nixfmt-rfc-style
nixfmt
nix-top
statix
];

View file

@ -74,7 +74,7 @@
"editor.formatOnSave" = false;
"editor.formatOnType" = false;
};
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"nix.formatterPath" = lib.getExe pkgs.nixfmt;
"nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = { };