Move back to rcrc files in dotfiles and fish

src/personal-setup/NOTES.md

@@ -12,11 +12,6 @@ I've previously (ab)used the _Dev Containers_ extension's built in dotfiles supp
 This feature:
 - Installs a set of packages in the container (including `rcm` for dotfiles management)
 - Mounts my dotfiles repositories into the container
-- Copies in an `rcrc` for dotfiles configuration, including:
-  - setting the correct tags and dotfiles mount locations
-  - avoiding setting up git config (as VS Code will copy it into the container anyway with
-    modifications, which would modify our canonical dotfiles version with transient,
-    container-specific setup)
 - Installs the dotfiles
 
 This feature is intended to be configured as part of my personal user settings as a default feature

src/personal-setup/README.md

@@ -7,7 +7,7 @@ Sets up my desired software and configuration for any devcontainer environment.
 
 ```json
 "features": {
-    "ghcr.io/csutter/devcontainer-features/personal-setup:3": {}
+    "ghcr.io/csutter/devcontainer-features/personal-setup:4": {}
 }
 ```
 
@@ -27,11 +27,6 @@ I've previously (ab)used the _Dev Containers_ extension's built in dotfiles supp
 This feature:
 - Installs a set of packages in the container (including `rcm` for dotfiles management)
 - Mounts my dotfiles repositories into the container
-- Copies in an `rcrc` for dotfiles configuration, including:
-  - setting the correct tags and dotfiles mount locations
-  - avoiding setting up git config (as VS Code will copy it into the container anyway with
-    modifications, which would modify our canonical dotfiles version with transient,
-    container-specific setup)
 - Installs the dotfiles
 
 This feature is intended to be configured as part of my personal user settings as a default feature

src/personal-setup/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "personal-setup",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "name": "Personal Setup",
   "description": "Sets up my desired software and configuration for any devcontainer environment.",
   "mounts": [
@@ -16,7 +16,7 @@
     }
   ],
   "containerEnv": {
-    "RCRC": "/etc/rcrc",
+    "RCRC": "/mnt/dotfiles/tag-devcontainer/rcrc",
     "_IS_DEVCONTAINER": "true"
   },
   "postCreateCommand": "rcup -vf"

src/personal-setup/install.sh

@@ -12,16 +12,14 @@ echo "Installing packages for distribution: $ID"
 case "$ID" in
     debian|ubuntu)
         apt-get update
-        apt-get install -y fzf git-delta rcm tree openssh-client
+        apt-get install -y fish git-delta rcm tree openssh-client
         ;;
     fedora)
-        dnf install -y fzf git-delta rcm tree openssh-clients
+        dnf install -y fish git-delta rcm tree openssh-clients
         ;;
     *)
         echo "Error: Unsupported distribution: $ID"
         echo "This feature supports: debian, ubuntu, fedora"
         exit 1
         ;;
 esac
-
-cp rcrc /etc/rcrc

test/personal-setup/test.sh

@@ -4,13 +4,12 @@ set -e
 source dev-container-features-test-lib
 
 check "delta is available"      bash -c "which delta"
-check "fzf is available"        bash -c "which fzf"
+check "fish is available"       bash -c "which fish"
 check "rcm is available"        bash -c "which rcup"
 check "ssh is available"        bash -c "which ssh"
 check "tree is available"       bash -c "which tree"
 # Use a dotfile that should _always_ be present on any system
-check "dotfiles are installed"  bash -c "test -f $HOME/.config/fish/config.fish"
-check "rcrc is present"         bash -c "test -f /etc/rcrc"
+check "dotfiles are installed"  bash -c "test -f $HOME/.rcrc"
 check "_IS_DEVCONTAINER is set" bash -c "test \"\$_IS_DEVCONTAINER\" = \"true\""
 
 reportResults