diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index e2f1398..5722500 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -5,7 +5,6 @@ set -eu # Parse options nicetohave=true -deoplete=true go=false rust=false rootzsh=false @@ -15,8 +14,6 @@ while [ $# != 0 ]; do case "$1" in nonicetohave) nicetohave=false;; nicetohave) nicetohave=true;; - nodeoplete) deoplete=false;; - deoplete) deoplete=true;; nogo) go=false;; go) go=true;; norust) rust=false;; @@ -260,7 +257,7 @@ esac # Install Rust $rust && download_rust -$rust && rustup component add rls rust-analysis rust-src +$rust && source $HOME/.cargo/env && rustup component add rls rust-analysis rust-src # Install dust diff --git a/.docker/alpine-rust b/.docker/alpine-rust index f4d0c2e..978f62c 100644 --- a/.docker/alpine-rust +++ b/.docker/alpine-rust @@ -15,7 +15,7 @@ RUN chmod go-rwx .gnupg USER ambrose -RUN ./.config/yadm/bootstrap rootzsh nodeoplete rust +RUN ./.config/yadm/bootstrap rootzsh rust LABEL org.opencontainers.image.title="environment" LABEL org.opencontainers.image.url="https://github.com/serverwentdown/env" diff --git a/.docker/fedora-rust b/.docker/fedora-rust index ff06873..26751f3 100644 --- a/.docker/fedora-rust +++ b/.docker/fedora-rust @@ -16,7 +16,7 @@ RUN chmod go-rwx .gnupg USER ambrose -RUN ./.config/yadm/bootstrap rootzsh nodeoplete rust +RUN ./.config/yadm/bootstrap rootzsh rust LABEL org.opencontainers.image.title="environment" LABEL org.opencontainers.image.url="https://github.com/serverwentdown/env"