From 1a338de3c08ca9610a37917d62d62cdb0a8a125f Mon Sep 17 00:00:00 2001 From: Matthew Deville Date: Sun, 1 Feb 2026 17:26:16 +0100 Subject: [PATCH] better tooling setup --- .vscode/extensions.json | 8 ++++++++ flake.lock | 12 ++++++------ flake.nix | 4 +--- rust-toolchain.toml | 3 ++- 4 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..9d83666 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "fill-labs.dependi", + "pinage404.nix-extension-pack", + "rust-lang.rust-analyzer", + "tamasfe.even-better-toml", + ] +} diff --git a/flake.lock b/flake.lock index e0d2640..6912c8f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1769789167, + "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768963622, - "narHash": "sha256-n6VHiUgrYD9yjagzG6ncVVqFbVTsKCI54tR9PNAFCo0=", + "lastModified": 1769915446, + "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2ef5b3362af585a83bafd34e7fc9b1f388c2e5e2", + "rev": "bc00300f010275e46feb3c3974df6587ff7b7808", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6acc2d1..48a9f42 100644 --- a/flake.nix +++ b/flake.nix @@ -20,9 +20,7 @@ overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv; - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ "rust-src" ]; - }; + rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; nativeBuildInputs = with pkgs; [ rustToolchain diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 292fe49..142ef87 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,3 @@ [toolchain] -channel = "stable" + channel = "stable" + components = ["clippy", "rust-analyzer", "rust-src"]