From 070cc1bf47fd8ff9722aa743a8953c2ef82aef4d Mon Sep 17 00:00:00 2001 From: Alex Povel Date: Fri, 24 May 2024 23:58:02 +0200 Subject: [PATCH] fix: Replace Rust setup w/ rustup The individual tools didnt play too well together. rustup just works --- home.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home.nix b/home.nix index 04ceb0a..5809caa 100644 --- a/home.nix +++ b/home.nix @@ -75,8 +75,6 @@ in ansible bat bottom - cargo - clippy cmake curl dig @@ -118,8 +116,7 @@ in ])) rclone rsync - rustc - rustfmt + rustup shellcheck sqlite (pkgs.rustPlatform.buildRustPackage @@ -416,6 +413,12 @@ in # which isn't natively installable via Nix (which usually takes care of completions). docker completion zsh > ${zshCustomCompletions}/_docker # Not the cheapest call; ~20ms on warm cache + for cmd in 'rustup' 'cargo'; do + # `cargo` completions were actually already set up, but `rustup` weren't. + # Just do both for consistency. + rustup completions zsh "$cmd" > "${zshCustomCompletions}/_$cmd"; + done + # More completions go here, in the form of `_some-command`... # Note: Nix will install most completions natively already. '';