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:
parent
ca479db8be
commit
75062d5568
4 changed files with 6 additions and 6 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -359,11 +359,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762938485,
|
"lastModified": 1769353635,
|
||||||
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
|
"narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
|
"rev": "f46bb205f239b415309f58166f8df6919fa88377",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
merge.tool = "vimdiff";
|
merge.tool = "vimdiff";
|
||||||
# provide `git mergetool -t nixfmt`
|
# provide `git mergetool -t nixfmt`
|
||||||
mergetool.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;
|
trustExitCode = true;
|
||||||
};
|
};
|
||||||
core.excludesfile = toString (
|
core.excludesfile = toString (
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ let
|
||||||
|
|
||||||
nixHelpers = [
|
nixHelpers = [
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
nix-top
|
nix-top
|
||||||
statix
|
statix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
"editor.formatOnSave" = false;
|
"editor.formatOnSave" = false;
|
||||||
"editor.formatOnType" = false;
|
"editor.formatOnType" = false;
|
||||||
};
|
};
|
||||||
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
|
"nix.formatterPath" = lib.getExe pkgs.nixfmt;
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.enableLanguageServer" = true;
|
||||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||||
"nix.serverSettings" = { };
|
"nix.serverSettings" = { };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue