From 4633541af31f3259b26ac028e0d3b4423fd587cc Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 31 Jan 2022 18:33:51 -0500 Subject: [PATCH] refactor: rm alejandra - In order to clean the lockfile --- flake.lock | 51 ++++++--------------------------------------------- flake.nix | 8 -------- treefmt.toml | 3 ++- 3 files changed, 8 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index af23a31..5c187ed 100644 --- a/flake.lock +++ b/flake.lock @@ -1,43 +1,5 @@ { "nodes": { - "alejandra": { - "inputs": { - "alejandra": [ - "alejandra" - ], - "fenix": [ - "fenix" - ], - "flakeCompat": [ - "flakeCompat" - ], - "flakeUtils": [ - "flakeUtils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rustAnalyzer": [ - "rustAnalyzer" - ], - "treefmt": [ - "treefmt" - ] - }, - "locked": { - "lastModified": 1643605065, - "narHash": "sha256-UPD3gVrq4TwkRL1dGXg9mU0YbbFAfM/HfRg3MeJVyu4=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "0f5e67f50994710122b3908e349d727d459928f2", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -48,11 +10,11 @@ ] }, "locked": { - "lastModified": 1643523738, - "narHash": "sha256-6XmIEKOtv26tO/wCPg/TQUKXFPfDKPS8pXOBEicSMsw=", + "lastModified": 1643610217, + "narHash": "sha256-3cFZt9Eyz70s1CNYO3wJeUDgLUC9tC4s5hNpLtX3FQY=", "owner": "nix-community", "repo": "fenix", - "rev": "08742f341a9bcf35b9ee0092c4e9ab309c860558", + "rev": "bd91b6fddf7fdf90ad9924339fcb40f008f57447", "type": "github" }, "original": { @@ -110,7 +72,6 @@ }, "root": { "inputs": { - "alejandra": "alejandra", "fenix": "fenix", "flakeCompat": "flakeCompat", "flakeUtils": "flakeUtils", @@ -122,11 +83,11 @@ "rustAnalyzer": { "flake": false, "locked": { - "lastModified": 1643580505, - "narHash": "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk=", + "lastModified": 1643645003, + "narHash": "sha256-uz+MXBcGoIqzc6acGB7GjJQsTWKr341+fjjv+pQR8N8=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "fd3942eb620e37a4e4bfdd587d8a2893ccf6fea0", + "rev": "4800c05a206eb156617b76fdb30af0b6c2c0fb26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6e96b7a..012fea5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,5 @@ { inputs = { - alejandra.url = "github:kamadorueda/alejandra"; - alejandra.inputs.fenix.follows = "fenix"; - alejandra.inputs.flakeCompat.follows = "flakeCompat"; - alejandra.inputs.flakeUtils.follows = "flakeUtils"; - alejandra.inputs.nixpkgs.follows = "nixpkgs"; - alejandra.inputs.rustAnalyzer.follows = "rustAnalyzer"; - alejandra.inputs.treefmt.follows = "treefmt"; fenix.url = "github:nix-community/fenix"; fenix.inputs.nixpkgs.follows = "nixpkgs"; fenix.inputs.rust-analyzer-src.follows = "rustAnalyzer"; @@ -69,7 +62,6 @@ fenix.latest.rust-src fenix.latest.rustc fenix.latest.rustfmt - inputs.alejandra.outputs.defaultPackage.${ system } nixpkgs.cargo-tarpaulin nixpkgs.jq nixpkgs.nodejs diff --git a/treefmt.toml b/treefmt.toml index 81f4e92..dad4d5c 100644 --- a/treefmt.toml +++ b/treefmt.toml @@ -6,8 +6,9 @@ includes = ["*.json"] options = ["-S"] [formatter.nix] -command = "alejandra" +command = "cargo" includes = ["*.nix"] +options = ["run", "--"] [formatter.prettier] command = "prettier"