diff --git a/images/homelab-workspace/Dockerfile b/images/homelab-workspace/Dockerfile
index 4e19945b..768112aa 100644
--- a/images/homelab-workspace/Dockerfile
+++ b/images/homelab-workspace/Dockerfile
@@ -521,6 +521,7 @@ COPY --link --chown=root:root --chmod=644 shell/bash_aliases.defaults /etc/bash_
 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
 
 # coder initialization scripts
 RUN mkdir -p /opt/coder/bin
diff --git a/images/homelab-workspace/shell/bash_aliases.defaults b/images/homelab-workspace/shell/bash_aliases.defaults
index bc8ad182..7d28df16 100644
--- a/images/homelab-workspace/shell/bash_aliases.defaults
+++ b/images/homelab-workspace/shell/bash_aliases.defaults
@@ -7,10 +7,8 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+alias ls='exa -F'
+alias ll='exa -alF'
 
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 alias bat='batcat'
diff --git a/images/homelab-workspace/shell/bash_completion.defaults b/images/homelab-workspace/shell/bash_completion.defaults
index c50f080e..bf15c9b1 100644
--- a/images/homelab-workspace/shell/bash_completion.defaults
+++ b/images/homelab-workspace/shell/bash_completion.defaults
@@ -23,3 +23,12 @@ source <(pip completion --bash)
 
 # flux
 source <(flux completion bash)
+
+# gh
+source <(gh completion -s bash)
+
+# kind
+source <(kind completion bash)
+
+# mc
+complete -C /usr/local/sbin/mc mc
diff --git a/images/homelab-workspace/shell/bashrc.extra b/images/homelab-workspace/shell/bashrc.extra
new file mode 100644
index 00000000..8e0666b2
--- /dev/null
+++ b/images/homelab-workspace/shell/bashrc.extra
@@ -0,0 +1 @@
+source <(zoxide init bash)