Merge branch 'local-dev-env-2' into local-dev-env-3

Update branch by merging @jcalderone's feedback on local-dev-env-2.

morph/grid/local/README.rst

@@ -78,7 +78,24 @@ Build and start the VMs::
 
   VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up
 
-Then::
+Then, once::
+
+  vagrant ssh-config > ./vagrant-ssh-config
+
+Add the IPs from ``grid.nix`` to the vagrant-ssh-config Host match blocks so the config reads like::
+
+  Host payments1 192.168.67.21
+    HostName 192.168.67.21
+    User vagrant
+    [...]
+
+Then, make morph use this ssh config either - with newer morph - point it to it::
+
+  export SSH_CONFIG_FILE=./vagrant-ssh-config
+
+Or, with older morph, adding the config to your user's ``~/.ssh/config`` file.
+
+Then, build and deploy our software to the Vagrant VMs::
 
   morph build grid.nix
   morph push grid.nix

morph/grid/local/Vagrantfile

@@ -33,6 +33,7 @@ Vagrant.configure("2") do |config|
   end
 
   # To make the VMs assign the static IPs to the network interfaces we need a rebuild:
+  config.vm.provision "shell", inline: "echo '{nix.trustedUsers = [ \"@wheel\" \"root\" \"vagrant\" ];}' > /etc/nixos/custom-configuration.nix"
   config.vm.provision "shell", inline: "nixos-rebuild switch"
 
   config.trigger.after :up do |trigger|