Improve separation of concerns

base/Dockerfile

@@ -45,11 +45,9 @@ WORKDIR /home/${DEVENV_USER}
 ENV GOPATH=/home/${DEVENV_USER}/go
 ENV NVIM_LISTEN_ADDRESS=/home/${DEVENV_USER}/nvimsocket
 
-COPY base/zshrc /home/${DEVENV_USER}/.zshrc
-COPY base/init.vim /home/${DEVENV_USER}/.config/nvim/init.vim
 COPY dotfiles/setup.sh /home/${DEVENV_USER}/setup.sh
+COPY base/init.vim /home/${DEVENV_USER}/.config/nvim/init.vim
 COPY dotfiles/init.vim /home/${DEVENV_USER}/dotfiles/init.vim
-COPY dotfiles/zshrc /home/${DEVENV_USER}/dotfiles/zshrc
 
 COPY base/build-home.sh /home/${DEVENV_USER}/build-home.sh
 
@@ -57,8 +55,11 @@ RUN sudo chown -R ${DEVENV_USER}:${DEVENV_USER} /home/${DEVENV_USER} \
   && chmod +x /home/${DEVENV_USER}/*.sh \
   && /home/${DEVENV_USER}/build-home.sh 
 
+COPY base/zshrc /home/${DEVENV_USER}/.zshrc
+COPY dotfiles/zshrc /home/${DEVENV_USER}/dotfiles/zshrc
+
 VOLUME /home/${DEVENV_USER}/.config
 VOLUME /home/${DEVENV_USER}/host
 
-ENTRYPOINT ["nvim", "+cd ~/host"]
+ENTRYPOINT ["zsh", "-c", "nvim", "+cd ~/host"]
 

docker-compose.yml

@@ -12,7 +12,6 @@ services:
         - "DEVENV_EMAIL=${DEVENV_EMAIL}"
         - "DEVENV_LOCALE=${DEVENV_LOCALE}"
         - "DEVENV_MOUNT_PATH=${DEVENV_MOUNT_PATH}"
-        - "DEVENV_PKGS=${DEVENV_PKGS}"
         - "PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/home/${DEVENV_USER}/perl5/bin"
     volumes:
       - ${DEVENV_MOUNT_PATH}:/home/${DEVENV_USER}/host

env.example

@@ -5,4 +5,3 @@ DEVENV_PASS="secret"
 DEVENV_EMAIL="email@example.com"
 DEVENV_MOUNT_PATH=$HOME
 DEVENV_GIT_DEF_BRANCH="main"
-DEVENV_PKGS="zsh ripgrep curl glances htop jq"