From 89741c02aea03734bae28597979adc91ba18a858 Mon Sep 17 00:00:00 2001
From: Lukas Dullinger <129603980+itislu@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:57:20 +0100
Subject: [PATCH] feat: Install `fish` and import fish config

---
 .devcontainer/Dockerfile        |  1 +
 .devcontainer/devcontainer.json |  1 +
 docker-compose.yml              |  1 +
 run.sh                          | 10 ++++++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c8abda3..5476fc1 100755
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -122,6 +122,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -
     xorg \
     zlib1g-dev \
     # User utilities
+    fish \
     python3 \
     python3-pip \
     python3-venv \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e0ed475..0179779 100755
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,6 +15,7 @@
         "source=${env:HOME}/.zsh_history,target=/home/${env:USERNAME:devcontainer}/.zsh_history,type=bind,consistency=cached",
         // Read-only and copy
         "source=${env:HOME}/.bashrc,target=/mnt/.bashrc,type=bind,consistency=cached,readonly=true",
+        "source=${env:HOME}/.config/fish,target=/mnt/.config/fish,type=bind,consistency=cached,readonly=true",
         "source=${env:HOME}/.gitconfig,target=/mnt/.gitconfig,type=bind,consistency=cached,readonly=true",
         "source=${env:HOME}/.ssh,target=/mnt/.ssh,type=bind,consistency=cached,readonly=true",
         "source=${env:HOME}/.zshrc,target=/mnt/.zshrc,type=bind,consistency=cached,readonly=true"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d56e6d..7fbaba3 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       - ${HOME}/.zsh_history:/home/${USERNAME:-devcontainer}/.zsh_history:cached
       # Read-only and copy
       - ${HOME}/.bashrc:/mnt/.bashrc:cached,ro
+      - ${HOME}/.config/fish:/mnt/.config/fish:cached,ro
       - ${HOME}/.gitconfig:/mnt/.gitconfig:cached,ro
       - ${HOME}/.ssh:/mnt/.ssh:cached,ro
       - ${HOME}/.zshrc:/mnt/.zshrc:cached,ro
diff --git a/run.sh b/run.sh
index 769fa9d..f5c374f 100755
--- a/run.sh
+++ b/run.sh
@@ -5,8 +5,14 @@ bash -c "$(curl -fsSL https://raw.githubusercontent.com/LeaYeh/42-Docker-DevEnv/
 curl -fsSL https://raw.githubusercontent.com/LeaYeh/42-Docker-DevEnv/main/docker-compose.yml -o docker-compose.yml
 
 # Ensure directories and files to be mounted exist
-mkdir -p "$HOME/.ssh"
-touch "$HOME/.bashrc" "$HOME/.gitconfig" "$HOME/.zsh_history" "$HOME/.zshrc"
+mkdir -p \
+	"$HOME/.config/fish/" \
+	"$HOME/.ssh"
+touch \
+	"$HOME/.bashrc" \
+	"$HOME/.gitconfig" \
+	"$HOME/.zsh_history" \
+	"$HOME/.zshrc"
 
 # Build and run the container
 docker-compose up --build -d 42-docker-devenv