From 8fc64f901f3718670e9a80a24727dc2099d1b4b1 Mon Sep 17 00:00:00 2001
From: Christian Sutter <git@doublesignal.com>
Date: Thu, 21 May 2026 14:37:34 +0100
Subject: [PATCH] Purge "oh-my-zsh"; fish as default; add `cloc`

---
 src/personal-setup/devcontainer-feature.json |  2 +-
 src/personal-setup/install.sh                | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/personal-setup/devcontainer-feature.json b/src/personal-setup/devcontainer-feature.json
index 1866424..9bb5963 100644
--- a/src/personal-setup/devcontainer-feature.json
+++ b/src/personal-setup/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "personal-setup",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "name": "Personal Setup",
   "description": "Sets up my desired software and configuration for any devcontainer environment.",
   "mounts": [
diff --git a/src/personal-setup/install.sh b/src/personal-setup/install.sh
index 2c2106e..7f02214 100755
--- a/src/personal-setup/install.sh
+++ b/src/personal-setup/install.sh
@@ -12,10 +12,10 @@ echo "Installing packages for distribution: $ID"
 case "$ID" in
     debian|ubuntu)
         apt-get update
-        apt-get install -y curl fd-find fish git-delta jq less openssh-client rcm ripgrep tree
+        apt-get install -y cloc curl fd-find fish git-delta jq less openssh-client rcm ripgrep tree
         ;;
     fedora)
-        dnf install -y curl fd-find fish git-delta jq less openssh-clients rcm ripgrep tree
+        dnf install -y cloc curl fd-find fish git-delta jq less openssh-clients rcm ripgrep tree
         ;;
     *)
         echo "Error: Unsupported distribution: $ID"
@@ -30,3 +30,9 @@ EXCLUDES="README.md"
 DOTFILES_DIRS="/mnt/dotfiles /mnt/dotfiles-private"
 TAGS="devcontainer"
 EOF
+
+# Some devcontainer configurations outside my control explicitly set zsh as the default shell, and
+# to add insult to injury, install the unspeakable abomination that is `oh-my-zsh`.
+echo "Purge oh-my-zsh and enforce fish as the default shell"
+rm -rf "${_REMOTE_USER_HOME}/.oh-my-zsh"
+chsh -s "$(which fish)" "${_REMOTE_USER}"