fix: various fixes to workspace initialization scripts

images/homelab-workspace/Dockerfile

@@ -490,20 +490,12 @@ RUN --mount=type=bind,from=sdk-nodejs,source=/env,target=/env/sdk-nodejs \
     # add all environment values from /env/*.env files to /etc/environment
     for env_file in $(find /env -type f -name *.env | sort); do cat $env_file >> /etc/environment; done
 
-# shell initialization scripts
-COPY --link --chown=root:root --chmod=644 shell/bash_aliases.defaults /etc/bash_aliases.defaults
-COPY --link --chown=root:root --chmod=644 shell/bash_completion.defaults /etc/bash_completion.defaults
-COPY --link --chown=root:root --chmod=644 shell/bashrc.defaults /etc/bashrc.defaults
-COPY --link --chown=root:root --chmod=644 shell/bashrc /etc/skel/.bashrc
-COPY --link --chown=root:root --chmod=644 shell/bashrc.extra /etc/skel/.bashrc.extra
+# copy /etc config files
+COPY --link --chown=root:root --chmod=644 etc/* /etc/
 
 # coder initialization scripts
-RUN mkdir -p /opt/coder/bin
 COPY --link --chown=root:root --chmod=755 coder/*.sh /opt/coder/bin/
 
-# supervisord configuration for docker and coder agent
-COPY --link --chown=root:root --chmod=644 etc/supervisord.conf /etc/supervisord.conf
-
 RUN rm -f /etc/apt/apt.conf.d/keep-cache
 
 # Add `coder` user (coder platform will connect the user in as this user)

images/homelab-workspace/shell/bashrc → images/homelab-workspace/etc/skel/.bashrc

@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 # ~/.bashrc: executed by bash(1) for non-login shells.
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) for examples
 

images/homelab-workspace/shell/bashrc.extra → images/homelab-workspace/etc/skel/.bashrc.extra

@@ -1,9 +1,9 @@
 source <(zoxide init bash)
 
 # shellcheck disable=SC2016
-echo 'eval "$($FNM_ROOT/fnm env --shell bash --use-on-cd --fnm-dir $FNM_ROOT)"'
+eval "$($FNM_ROOT/fnm env --shell bash --use-on-cd --fnm-dir $HOME/.fnm)"
 # shellcheck disable=SC2016
-echo 'eval "$(${HOME}/.local/bin/starship init bash)"'
+eval "$(${HOME}/.local/bin/starship init bash)"
 
 if [[ -f $HOME/.krew/bin/kubectl-cnpg ]]; then
   ln -sf $HOME/.krew/bin/kubectl-cnpg $HOME/.local/bin/cnpg