chore: further simplifications

bnb · bnb · commit 2e035ec28913 · 2020-04-23T16:07:26.000-04:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,5 +9,8 @@
         "vscode-icons-team.vscode-icons",
         "visualstudioexptteam.vscodeintellicode"
     ],
-    "dockerFile": "Dockerfile"
+    "dockerFile": "Dockerfile",
+    "settings": {
+        "terminal.integrated.shell.linux": "/usr/bin/zsh"
+    }
 }
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -1,26 +1,22 @@
+## set-up yarn's deb registry
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+
 ## update and install some things we should probably have
 apt-get update
-apt-get install -y \
+apt-get install -y --no-install-recommends \
   curl \
   git \
   jq \
+  yarn \
   zsh
 
-## set-up and install yarn
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-apt-get install yarn -y --no-install-recommends
-
 ## instsall nvm
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
 
-## add 'developer' and make them a superusers
-useradd -m developer
-su developer
-
 ## setup and install oh-my-zsh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 cp -R /root/.oh-my-zsh /home/$USERNAME
 cp /root/.zshrc /home/$USERNAME
 sed -i -e "s/\/root\/.oh-my-zsh/\/home\/$USERNAME\/.oh-my-zsh/g" /home/$USERNAME/.zshrc
-chown -R $USER_UID:$USER_GID /home/$USERNAME/.oh-my-zsh /home/$USERNAME/.zshrcs
+chown -R $USER_UID:$USER_GID /home/$USERNAME/.oh-my-zsh /home/$USERNAME/.zshrcsx`
