From b979fadb434937de36a2ad184ff45118b9fc1bad Mon Sep 17 00:00:00 2001 From: Matthew Deville Date: Sun, 1 Feb 2026 18:42:22 +0100 Subject: [PATCH] wip --- .vscode/extensions.json | 3 ++- flake.nix | 4 +++- rust-toolchain.toml | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 rust-toolchain.toml diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 9d83666..6a0a761 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,8 @@ { "recommendations": [ "fill-labs.dependi", - "pinage404.nix-extension-pack", + "jnoortheen.nix-ide", + "mkhl.direnv", "rust-lang.rust-analyzer", "tamasfe.even-better-toml", ] diff --git a/flake.nix b/flake.nix index 48a9f42..6acc2d1 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,9 @@ overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv; - rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + rustToolchain = pkgs.rust-bin.stable.latest.default.override { + extensions = [ "rust-src" ]; + }; nativeBuildInputs = with pkgs; [ rustToolchain diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 142ef87..0000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] - channel = "stable" - components = ["clippy", "rust-analyzer", "rust-src"]