Sadan/dotfiles
1
1
Fork 0
mirror of https://github.com/sadan4/dotfiles.git synced 2025-03-31 04:31:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch completions to workaround https://github.com/rust-lang/rustup/issues/2268

Browse source
This commit is contained in:
sadan 2025-03-17 20:24:55 -04:00
parent 1be2f3237a
commit 81503ad83f
No known key found for this signature in database
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
common/users/homeModules/dev/rust.nix
View file

@ -1,7 +1,22 @@
{pkgs, ...}: {
home = {
packages = with pkgs; [
rustup
];
{ pkgs, ... }:
{
home = {
packages = with pkgs; [
rustup
];
};
programs = {
zsh = {
# Few horror things here
# 1. rustup's completion is broken for zsh. See: https://github.com/rust-lang/rustup/issues/2268
# 2. patch cant read the source file from stdin, so tmpfiles have to be used
initExtra = ''
TMP_RUSTUP_FILE=$(mktemp)
${pkgs.rustup}/bin/rustup completions zsh > "$TMP_RUSTUP_FILE"
eval "$(patch -s -o - -i ${./rustupCompPatch.diff} $TMP_RUSTUP_FILE)"
rm $TMP_RUSTUP_FILE
unset TMP_RUSTUP_FILE
'';
};
}
};
}

17
common/users/homeModules/dev/rustupCompPatch.diff Normal file
View file

@ -0,0 +1,17 @@
26c26,28
< '::+toolchain -- release channel (e.g. +stable) or custom toolchain to set override:' \
---
> '(+beta +nightly)+stable[use the stable toolchain]' \
> '(+stable +nightly)+beta[use the beta toolchain]' \
> '(+stable +beta)+nightly[use the nightly toolchain]' \
32c34
< words=($line[2] "${words[@]}")
---
> words=($line[1] "${words[@]}")
34,35c36,37
< curcontext="${curcontext%:*:*}:rustup-command-$line[2]:"
< case $line[2] in
---
> curcontext="${curcontext%:*:*}:rustup-command-$line[1]:"
> case $line[1] in