Merge pull request #11 from braun-daniel/feature/fzf

Finalized fzf and spaceship
braun-daniel · Oct 11, 2024 · dbf389c · dbf389c
2 parents 9a7b72a + c3c5cb7
commit dbf389c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -18,8 +18,13 @@
         }
     },
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/braun-daniel/devcontainer-features/fzf:1": {},
+        "ghcr.io/braun-daniel/devcontainer-features/spaceship:1": {}
     },
     "remoteUser": "node",
-    "updateContentCommand": "npm install -g @devcontainers/cli"
+    "updateContentCommand": "npm install -g @devcontainers/cli",
+    "containerEnv": {
+        "SHELL": "/bin/zsh"
+    }
 }
diff --git a/src/fzf/devcontainer-feature.json b/src/fzf/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "fzf",
     "id": "fzf",
-    "version": "0.0.3",
+    "version": "1.0.0",
     "description": "Installs fzf - a command line fuzzy search.",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"

diff --git a/src/fzf/install.sh b/src/fzf/install.sh
@@ -7,9 +7,10 @@ echo "Installing git and wget..."
 apt-get update
 apt-get install -y git wget
 
-# Install fzf as the remote user
+# Prepare variables
 _REMOTE_USER=${_REMOTE_USER:-"root"}
 _REMOTE_USER_HOME=$(eval echo "~${_REMOTE_USER}")
 
+# Install fzf
 su - "$_REMOTE_USER" -c "git clone --depth 1 https://github.com/junegunn/fzf.git ${_REMOTE_USER_HOME}/.fzf"
 su - "$_REMOTE_USER" -c "${_REMOTE_USER_HOME}/.fzf/install --all"
diff --git a/src/spaceship/devcontainer-feature.json b/src/spaceship/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "Spaceship",
     "id": "spaceship",
-    "version": "0.0.3",
+    "version": "1.0.0",
     "description": "Installs spaceship-prompt.",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"

diff --git a/src/spaceship/install.sh b/src/spaceship/install.sh
@@ -9,9 +9,9 @@ echo "Installing dependencies..."
 apt-get update
 apt-get install -y zsh git
 
-# Use ZSH as default shell
-echo "Permanently changing shell to ZSH..."
-chsh -s "$(which zsh)"
+# Prepare variables
+_REMOTE_USER=${_REMOTE_USER:-"root"}
+_REMOTE_USER_HOME=$(eval echo "~${_REMOTE_USER}")
 
 # Install spaceship-prompt
 su - "$_REMOTE_USER" -c "mkdir -p ${_REMOTE_USER_HOME}/.zsh"