diff --git a/flake.nix b/flake.nix
index 061930b..79b4819 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,7 @@
           # nix develop
           devShell = pkgs.mkShell {
             inputsFrom = builtins.attrValues self.packages.${system};
-            buildInputs = with pkgs; [
+            nativeBuildInputs = with pkgs; [
               # Nix LSP + formatter
               rnix-lsp
               nixpkgs-fmt
@@ -67,7 +67,6 @@
               (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
               cargo-watch
               rust-analyzer
-              rustfmt
 
               # Notmuch
               notmuch
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 055c9f0..89378c5 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,2 @@
 [toolchain]
 channel = "1.58.1"
-components = ["cargo", "rustc", "rustfmt", "rust-analysis", "clippy"]