From 32522df0e25c028fa1b7272be9474870a911ddee Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <nixy@nixy.moe>
Date: Fri, 10 Nov 2023 20:26:09 +0000
Subject: [PATCH] General updates to keep VM up to date

---
 Vagrantfile                          | 21 ++++++++++++++++-----
 provisioners/install-apt-packages.sh |  4 ++--
 provisioners/install-xfce-minimal.sh |  6 +++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e073f57..541e877 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,7 +26,8 @@ gui_enabled = ENV['VAGRANT_GUI'] || true
 # backwards compatibility). Please don't change it unless you know what
 # you're doing.
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "ubuntu/jammy64"
+  config.vbguest.auto_update = false
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -35,13 +36,13 @@ Vagrant.configure("2") do |config|
 
   # 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"
+  config.vm.network "private_network", ip: "192.168.4.20"
 
   # Share a folder between guest and host for convenience
   config.vm.synced_folder File.join(".", "data"), "/media/data"
 
   # Use vagrant-disksize plugin to resize disk as desired
-  config.disksize.size = ENV["VAGRANT_DISKSIZE"] || "20GB"
+  config.disksize.size = ENV["VAGRANT_DISKSIZE"] || "40GB"
 
   config.vm.provider "virtualbox" do |vb|
     vb.memory = ENV['VAGRANT_MEMORY'] || 1024 * 8
@@ -51,9 +52,19 @@ Vagrant.configure("2") do |config|
     vb.gui = gui_enabled
     if gui_enabled
       vb.customize ["modifyvm", :id, "--monitorcount", (ENV['VAGRANT_MONITORS'] || '1')]
-      vb.customize ["modifyvm", :id, "--graphicscontroller", "vboxsvga"]
-      vb.customize ["modifyvm", :id, "--vram", "128"]
+
+      vb.customize ["modifyvm", :id, "--graphicscontroller", "vmsvga"]
+      vb.customize ["modifyvm", :id, "--vram", "256"]
+      vb.customize ["modifyvm", :id, "--accelerate3d",  "on"]
+      vb.customize ["modifyvm", :id, "--accelerate2dvideo",  "on"]
+
+      # Clipboard sharing
+      vb.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
+
     end
+
+    # Use hosts DNS resolver
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
   end
 
   config.vm.define "default", primary: true do |primary|
diff --git a/provisioners/install-apt-packages.sh b/provisioners/install-apt-packages.sh
index 3439070..49f05be 100644
--- a/provisioners/install-apt-packages.sh
+++ b/provisioners/install-apt-packages.sh
@@ -4,8 +4,7 @@
 # A list of packages to install
 apt_packages=(
   # Docker setup
-  "docker"
-  "docker-compose"
+  "docker.io"
 
   # General utilities
   "dos2unix"
@@ -14,6 +13,7 @@ apt_packages=(
   "vim"
   "expect"
   "jq"
+  "xclip"
 
   # For encryption in git
   "git-crypt"
diff --git a/provisioners/install-xfce-minimal.sh b/provisioners/install-xfce-minimal.sh
index 755f476..971c48f 100755
--- a/provisioners/install-xfce-minimal.sh
+++ b/provisioners/install-xfce-minimal.sh
@@ -3,13 +3,17 @@
 # Ensure that no interactive prompts are used
 export DEBIAN_FRONTEND=noninteractive
 
+apt-get update
+# Necessary starting in jammy jellyfish
+apt-get install -qy tasksel
+tasksel install xubuntu-desktop
+
 # Additional pacakges to ensure a nice experience
 additional_packages=(
   xfce4
   xfce4-terminal
   xfce4-whiskermenu-plugin
   menulibre
-  firefox
   pinentry-gtk2
   policykit-desktop-privileges
 )