diff --git a/.treefmt.toml b/.treefmt.toml deleted file mode 100644 index 3bf60fa..0000000 --- a/.treefmt.toml +++ /dev/null @@ -1,12 +0,0 @@ -[formatter.nix] -command = "alejandra" -includes = ["*.nix"] - -[formatter.rust] -command = "rustfmt" -includes = ["*.rs"] - -[formatter.toml] -command = "taplo" -options = ["fmt"] -includes = ["*.toml"] diff --git a/flake.lock b/flake.lock index 156ea61..1e45491 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,15 @@ ] }, "locked": { - "lastModified": 1705625727, - "narHash": "sha256-naMq6+TNLpEiBBjc0XaCbMLYJxJXWTZz4JGSpYGgIOM=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "8f515142e805dc377cf8edb0ff75d14a11307f89", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { "owner": "ipetkov", - "ref": "v0.16.0", "repo": "crane", "type": "github" } diff --git a/flake.nix b/flake.nix index 1d78046..fdcabb6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; - crane.url = "github:ipetkov/crane?ref=v0.16.0"; + crane.url = "github:ipetkov/crane"; crane.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/formatter.nix b/nix/formatter.nix index 7624623..057b511 100644 --- a/nix/formatter.nix +++ b/nix/formatter.nix @@ -4,8 +4,8 @@ perSystem = _: { treefmt = { - projectRootFile = "flake.lock"; - programs.nixfmt-rfc-style.enable = true; + projectRootFile = ".git/config"; + programs.nixfmt.enable = true; programs.rustfmt.enable = true; programs.taplo.enable = true; };