From bd49e71adc4079131f64904fd1f16ea13f7962b4 Mon Sep 17 00:00:00 2001 From: Christian Sutter Date: Mon, 30 Mar 2026 16:48:38 +0100 Subject: [PATCH] Write `rcrc` from install script Going around in circles but it does seem like this is a better place for it than living in the dotfiles themselves. --- src/personal-setup/README.md | 2 +- src/personal-setup/devcontainer-feature.json | 4 ++-- src/personal-setup/install.sh | 7 +++++++ test/personal-setup/test.sh | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/personal-setup/README.md b/src/personal-setup/README.md index 934b55a..cd4cd5b 100644 --- a/src/personal-setup/README.md +++ b/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:4": {} + "ghcr.io/csutter/devcontainer-features/personal-setup:5": {} } ``` diff --git a/src/personal-setup/devcontainer-feature.json b/src/personal-setup/devcontainer-feature.json index d11ebc5..1866424 100644 --- a/src/personal-setup/devcontainer-feature.json +++ b/src/personal-setup/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "personal-setup", - "version": "4.2.0", + "version": "5.0.0", "name": "Personal Setup", "description": "Sets up my desired software and configuration for any devcontainer environment.", "mounts": [ @@ -16,7 +16,7 @@ } ], "containerEnv": { - "RCRC": "/mnt/dotfiles/tag-devcontainer/rcrc", + "PROMPT_PREFIX": "", // Nerd font "remote" icon "_IS_DEVCONTAINER": "true" }, diff --git a/src/personal-setup/install.sh b/src/personal-setup/install.sh index 7de8a9c..2c2106e 100755 --- a/src/personal-setup/install.sh +++ b/src/personal-setup/install.sh @@ -23,3 +23,10 @@ case "$ID" in exit 1 ;; esac + +echo "Setting up rcm configuration for user: $_REMOTE_USER" +cat > "$_REMOTE_USER_HOME/.rcrc" <<'EOF' +EXCLUDES="README.md" +DOTFILES_DIRS="/mnt/dotfiles /mnt/dotfiles-private" +TAGS="devcontainer" +EOF diff --git a/test/personal-setup/test.sh b/test/personal-setup/test.sh index 46f8fe3..97282f1 100755 --- a/test/personal-setup/test.sh +++ b/test/personal-setup/test.sh @@ -16,7 +16,9 @@ check "ssh is available" bash -c "which ssh" check "tree is available" bash -c "which tree" # Check dotfiles are installed -check "dotfiles are installed" bash -c "test -f $HOME/.rcrc" +# WARNING: implicit dependency on the contents of the dotfiles repo +check "rcrc is created" bash -c "test -f $HOME/.rcrc" +check "dotfiles are linked" bash -c "test -L $HOME/.config/git/config_devcontainer" # Check environment variables are set check "_IS_DEVCONTAINER is set" bash -c "test \"\$_IS_DEVCONTAINER\" = \"true\""