diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a0bd4a9..6ad4a22 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,2 +1,5 @@ -fish_add_path /root/.cargo/bin/ +if status is-interactive + fish_add_path /root/.cargo/bin/ + # Commands to run in interactive sessions can go here +end diff --git a/Dockerfile b/Dockerfile index fa9d465..20478aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:edge + # Install base dependencies and build tools RUN apk add --no-cache \ fish \ @@ -21,6 +22,9 @@ RUN apk add --no-cache \ cargo \ git +COPY ./setup_langs ./setup_langs +COPY ./.config ./root/.config + RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash RUN cargo binstall --strategies crate-meta-data jj-cli