diff --git a/Dockerfile b/Dockerfile index de24d27..c17e64f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,8 +115,7 @@ RUN curl -sS https://starship.rs/install.sh | sh -s -- --yes \ && mkdir -p /usr/local/lib/docker/cli-plugins \ && curl -L ${DC_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose \ && chmod 750 /usr/local/lib/docker/cli-plugins/docker-compose \ - && chgrp --recursive docker /usr/local/lib/docker \ - && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + && chgrp --recursive docker /usr/local/lib/docker USER coder WORKDIR /home/coder @@ -131,14 +130,21 @@ ENV XDG_CONFIG_HOME ${HOME}/.config ENV XDG_DATA_HOME ${HOME}/.local/share ENV XDG_CACHE_HOME ${HOME}/.cache ENV STARSHIP_CONFIG ${XDG_CONFIG_HOME}/starship/config.toml -ENV PATH ${LOCAL_BIN_HOME}:$PATH +ENV CARGO_HOME ${XDG_DATA_HOME}/cargo +ENV RUSTUP_HOME ${XDG_DATA_HOME}/rustup +ENV PATH ${LOCAL_BIN_HOME}:${CARGO_HOME}/bin:$PATH # NOTE (jpd): to install elixirls we have to set the shell to something known ENV SHELL /usr/bin/bash # command line utilities RUN curl https://rtx.pub/install.sh | sh \ && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash \ - && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm + && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm \ + && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ + && git clone https://git.sr.ht/~mpdehaan/jetporch ${LOCAL_SRC_HOME}/jetporch \ + && cd ${LOCAL_SRC_HOME}/jetporch \ + && make \ + && ln -s ${LOCAL_SRC_HOME}/jetporch/target/release/jetp ${LOCAL_BIN_HOME}/ # git configuration COPY ./patch/kickstart.nvim/updates.patch /tmp