Update to recent box

README.md

@@ -13,6 +13,8 @@ To test drive the environment (minus i3) before committing, install [Vagrant](ht
     $ vagrant up
     $ vagrant ssh
 
+If you want to try i3, just logout and click on the icon to the right of the vagrant username and select i3, then login using the password 'vagrant'.
+
 You can, of course, just keep this box installed and do your development in there. You'll just want to change your git name and email in `~/.gitconfig` to your own first.
 
 ### Features
@@ -101,7 +103,7 @@ To delete the backups:
 
 ### Ubuntu
 
-    $ sudo apt-get install git vim-nox zsh tmux i3 ranger python python-dev python-setuptools curl
+    $ sudo apt-get install git vim-nox zsh tmux i3 ranger python python-dev python-pip curl
 
 ### Mac OS X
 
@@ -122,6 +124,5 @@ To delete the backups:
 
 IPython is a fantastic python interactive shell, and flake8 lets vim show you where you're not adhering to python syntax or coding style.
 
-    $ sudo easy_install pip
-    $ sudo easy_install ipython
-    $ sudo easy_install flake8
+    $ sudo pip3 install ipython
+    $ sudo pip3 install flake8

Vagrantfile

@@ -5,8 +5,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "saucy32"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box"
+  config.vm.box = "boxcutter/ubuntu1604-desktop"
   config.vm.provision :shell, :path => "demo/provision.sh"
   config.ssh.forward_agent = true
 

demo/provision.sh

@@ -1,23 +1,27 @@
 #!/usr/bin/env bash
 
 apt-get update
-apt-get install -y python-dev
-apt-get install -y python-setuptools
+apt-get install -y python-pip # this pulls in the latest python 2.7-dev if it isn't already installed
+apt-get install -y python3-pip # this pulls in the latest python 3.x-dev (3.5 currently) if it isn't already installed
+pip install --upgrade pip # because apt is always behind the times
+pip3 install --upgrade pip # because apt is always behind the times
 apt-get install -y git
-apt-get install -y vim-nox
+apt-get install -y vim-nox # this pulls in ruby, ewwww
 apt-get install -y zsh
 apt-get install -y tmux
 apt-get install -y ranger
 apt-get install -y curl
+apt-get install -y i3 # if you are gonna have the configs for it, you might as well use the sweetness
 
-easy_install pip
-easy_install ipython
-easy_install flake8
+pip3 install ipython # not using Python3/pip3 throws warnings about only iPython 5.x LTS being supported by Python <3.5 
+pip install flake8
+pip3 install flake8
 
-sudo -u vagrant -H git clone https://github.com/alanctkc/dotfiles-old /home/vagrant/.config/dotfiles-old
-pushd /home/vagrant/.config/dotfiles-old
-sudo -u vagrant -H ./bootstrap.sh --no-i3 --git-name "Vagrant User" --git-email vagrant@example.com
-sudo -u vagrant -H ./bootstrap.sh --delete-backups
-popd
+DOTFILES=/home/vagrant/.config/dotfiles
+sudo -u vagrant -H mkdir -p $DOTFILES
+sudo -u vagrant -H cp -R /vagrant/{*,.*} $DOTFILES
+sudo -u vagrant -H chown -R vagrant:vagrant $DOTFILES
+sudo -u vagrant -H bash $DOTFILES/bootstrap.sh --git-name "Vagrant User" --git-email vagrant@example.com
+sudo -u vagrant -H bash $DOTFILES/bootstrap.sh --delete-backups
 hostname demo
 usermod -s /usr/bin/zsh vagrant