diff --git a/flake.lock b/flake.lock index f9e30c5..a15c4db 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/home/common.nix b/home/common.nix index ed9157f..0df7d8f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -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 ( diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 47e37ae..cdfedeb 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -90,7 +90,7 @@ let nixHelpers = [ nixpkgs-review - nixfmt-rfc-style + nixfmt nix-top statix ]; diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 705ff27..132df97 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -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" = { };