Update dev vm image

dev/dev-vm/Dockerfile

@@ -27,20 +27,14 @@ ENV PATH /usr/local/go/bin:$PATH
 RUN wget https://get.docker.com/builds/Linux/x86_64/docker-latest -O /usr/local/bin/docker && \
     chmod 555 /usr/local/bin/docker
 
-USER xena
-
 WORKDIR /home/xena
 
 # Dotfiles
-RUN mkdir code
-RUN git clone https://github.com/Xe/dotfiles code/dotfiles
+RUN setuser xena mkdir code
+RUN setuser xena git clone https://github.com/Xe/dotfiles code/dotfiles
 
 ADD setup.sh /home/xena/
-RUN bash setup.sh
-
-RUN vim +GoInstallBinaries +qall
-
-USER root
+RUN setuser xena bash setup.sh && rm setup.sh
 
 RUN chsh xena -s /bin/zsh
 

dev/dev-vm/setup.sh

@@ -11,7 +11,6 @@ function setlink
 rm ~/.zshrc
 
 #set links
-setlink .profile
 setlink .zshrc
 setlink .zsh
 setlink .vim
@@ -32,12 +31,14 @@ rm ~/.vimrc-temp
 (cd ~/.vim/bundle/YouCompleteMe; ./install.sh --clang-completer)
 (cd ~/.vim/bundle/vimproc.vim; make)
 
-vim +GoInstallBinaries
+vim +GoInstallBinaries +qall
 
 # Golang stuff
 (mkdir -p ~/go/{pkg,bin,src})
 
 go get github.com/mattn/todo
+go get github.com/motemen/ghq
+go get github.com/Xe/tools/...
 
 echo "Set up!"