vagrant: enable x11forwarding by default

1 files changed, 10 insertions, 63 deletions

diff --git a/Vagrantfile b/Vagrantfile
index e6a1059..7fd0e2e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,88 +1,35 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
 Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "archlinux/archlinux"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # NOTE: This will enable public access to the opened port
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine and only allow access
-  # via 127.0.0.1 to disable public access
-  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "~/.mail", "/vagrant/mail"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider "virtualbox" do |vb|
-    # Display the VirtualBox GUI when booting the machine
-    # vb.gui = true
-
-    # Customize the amount of memory on the VM:
-    vb.memory = (3 * 1024).to_s
-    vb.cpus   = 4
+  config.vm.provider "virtualbox" do |v|
+    config.vm.box = "archlinux/archlinux"
+    v.memory = (3 * 1024).to_s
+    v.cpus   = 4
   end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-  #
+
   config.ssh.forward_x11 = true
 
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     pacman -Syu --noconfirm
 
-    pacman -S --noconfirm --needed cmake ninja git gcc notmuch-runtime glibmm gtkmm3 vte3 boost libsass libpeas ruby-ronn pkgconf webkit2gtk protobuf gobject-introspection xorg-xauth xorg-xclock cmark python-gobject ipython gvim
+    pacman -S --noconfirm --needed cmake ninja ccache git gcc notmuch-runtime glibmm gtkmm3 vte3 boost libsass libpeas ruby-ronn pkgconf webkit2gtk protobuf gobject-introspection xorg-xauth xorg-xclock cmark python-gobject ipython gvim
 
     cat > /etc/profile.d/astroid.sh <<EOL
       export ASTROID_DIR=/vagrant
       export GI_TYPELIB_PATH=/home/vagrant/build
 EOL
 
+    sed -e "s|#X11Forwarding no|X11Forwarding yes|" -i /etc/ssh/sshd_config
+
   SHELL
 
   config.vm.provision "shell", privileged: false, inline: <<-SHELL
 
     mkdir -p /home/vagrant/build
     cd /home/vagrant/build
-    cmake -GNinja /vagrant
+    cmake -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always /vagrant
 
   SHELL
 end
+