From 9d5a7aec498546f98cad5ff153ccc974025c89a0 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Sat, 12 Jan 2019 13:07:17 +1100
Subject: [PATCH] fixes

---
 Dockerfile         |  8 --------
 scripts/restart.sh |  4 ++--
 scripts/start.sh   | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96d03bd..822f505 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,14 +73,6 @@ RUN git clone https://github.com/sabrehagen/dotfiles-tmux
 RUN git clone https://github.com/sabrehagen/dotfiles-vcsh
 RUN git clone https://github.com/sabrehagen/dotfiles-zsh
 
-# Add zsh aliases
-RUN echo 'tree="tree -a -I .git -I node_modules -L 4"' >> $HOME/.zshenv
-RUN echo 'wifi=wicd-curses' >> $HOME/.zshenv
-
-# Manage ssh keys using keychain
-RUN echo 'keychain $HOME/.ssh/id_rsa >/dev/null 2>&1' >> $HOME/.zshenv
-RUN echo 'source $HOME/.keychain/$(hostname)-sh' >> $HOME/.zshenv
-
 # Add custom binaries
 COPY bin /usr/local
 
diff --git a/scripts/restart.sh b/scripts/restart.sh
index 3e47e37..ed63c02 100755
--- a/scripts/restart.sh
+++ b/scripts/restart.sh
@@ -1,4 +1,4 @@
 REPO_ROOT=$(dirname $(realpath $0))/..
 
-sh $REPO_ROOT/stop.sh
-sh $REPO_ROOT/start.sh
+sh $REPO_ROOT/scripts/stop.sh
+sh $REPO_ROOT/scripts/start.sh
diff --git a/scripts/start.sh b/scripts/start.sh
index 647029b..a94ec8f 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,5 +1,7 @@
 REPO_ROOT=$(dirname $(realpath $0))/..
 
+JACKSON_HOME=/jackson/home
+
 docker run \
   --detach \
   --device /dev/snd \
@@ -8,7 +10,7 @@ docker run \
   --device /dev/usb \
   --device /dev/bus/usb \
   --env DISPLAY \
-  --env SSH_AUTH_SOCK \
+  --env SSH_AUTH_SOCK=$JACKSON_HOME/.ssh/auth.sock \
   --env STEMN_GIT_EMAIL="$(git config --get user.email)" \
   --env STEMN_GIT_NAME="$(git config --get user.name)" \
   --group-add audio \
@@ -23,9 +25,13 @@ docker run \
   --volume /etc/localtime:/etc/localtime:ro \
   --volume /tmp/.X11-unix:/tmp/.X11-unix \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --volume $HOME/.ssh:$STEMN_HOME/.ssh \
-  --volume $HOME:/home \
-  --volume $SSH_AUTH_SOCK:$SSH_AUTH_SOCK \
-  --volume JACKSON_HOME:/jackson/home \
-  --workdir /home \
+  --volume $HOME/.ssh:$JACKSON_HOME/.ssh \
+  --volume $HOME/notes:$JACKSON_HOME/notes \
+  --volume $HOME/repositories:$JACKSON_HOME/repositories \
+  --volume $HOME/Downloads:$JACKSON_HOME/Downloads \
+  --volume $HOME/Pictures:$JACKSON_HOME/Pictures \
+  --volume $HOME/Videos:$JACKSON_HOME/Videos \
+  --volume ${SSH_AUTH_SOCK-$HOME/.ssh/auth.sock}:$JACKSON_HOME/.ssh/auth.sock \
+  --volume JACKSON_HOME:$JACKSON_HOME \
+  --workdir $JACKSON_HOME \
   sabrehagen/development-environment:latest