From 2222c9d033e0a957f0f7043a96081b8ffa0cbbc5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 25 Nov 2022 15:29:29 -0500
Subject: [PATCH] Switch to an explicit install_graphics variable rather than
 using graphics_driver to control all graphics install.

---
 ansible/environments/laptop/host_vars/odofreebsd | 1 +
 ansible/environments/laptop/host_vars/odolinux   | 1 +
 ansible/roles/alacritty/tasks/main.yaml          | 2 +-
 ansible/roles/firefox/tasks/main.yaml            | 2 +-
 ansible/roles/fonts/tasks/main.yaml              | 2 +-
 ansible/roles/gpg/tasks/freebsd.yaml             | 2 +-
 ansible/roles/gpg/templates/gpg-agent.conf.j2    | 4 ++--
 ansible/roles/graphics/tasks/main.yaml           | 2 +-
 ansible/roles/sway/tasks/main.yaml               | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd
index 72d7ee1..75dadf1 100644
--- a/ansible/environments/laptop/host_vars/odofreebsd
+++ b/ansible/environments/laptop/host_vars/odofreebsd
@@ -11,6 +11,7 @@ network_rc: "odofreebsd_network.conf"
 rc_conf: "odofreebsd_rc.conf"
 loader_conf: "odofreebsd_loader.conf"
 netgraph_config: "setup_netgraph_odo"
+install_graphics: true
 graphics_driver: "intel"
 cputype: "intel"
 cpu_opt: tigerlake
diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux
index c942d40..76ed30b 100644
--- a/ansible/environments/laptop/host_vars/odolinux
+++ b/ansible/environments/laptop/host_vars/odolinux
@@ -18,6 +18,7 @@ users:
 zfs_snapshot_datasets:
   - zroot/linux/archmain/home
   - zroot/linux/archmain/be
+install_graphics: true
 graphics_driver: "intel"
 build_user:
   name: talexander
diff --git a/ansible/roles/alacritty/tasks/main.yaml b/ansible/roles/alacritty/tasks/main.yaml
index dc9939d..9123a57 100644
--- a/ansible/roles/alacritty/tasks/main.yaml
+++ b/ansible/roles/alacritty/tasks/main.yaml
@@ -1,2 +1,2 @@
 - import_tasks: tasks/common.yaml
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics
diff --git a/ansible/roles/firefox/tasks/main.yaml b/ansible/roles/firefox/tasks/main.yaml
index dc9939d..9123a57 100644
--- a/ansible/roles/firefox/tasks/main.yaml
+++ b/ansible/roles/firefox/tasks/main.yaml
@@ -1,2 +1,2 @@
 - import_tasks: tasks/common.yaml
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics
diff --git a/ansible/roles/fonts/tasks/main.yaml b/ansible/roles/fonts/tasks/main.yaml
index dc9939d..9123a57 100644
--- a/ansible/roles/fonts/tasks/main.yaml
+++ b/ansible/roles/fonts/tasks/main.yaml
@@ -1,2 +1,2 @@
 - import_tasks: tasks/common.yaml
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics
diff --git a/ansible/roles/gpg/tasks/freebsd.yaml b/ansible/roles/gpg/tasks/freebsd.yaml
index f4d6658..bdd91e2 100644
--- a/ansible/roles/gpg/tasks/freebsd.yaml
+++ b/ansible/roles/gpg/tasks/freebsd.yaml
@@ -9,7 +9,7 @@
     state: present
 
 - name: Install packages
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics
   package:
     name:
       - pinentry-qt5
diff --git a/ansible/roles/gpg/templates/gpg-agent.conf.j2 b/ansible/roles/gpg/templates/gpg-agent.conf.j2
index 9ba31fd..31ce5df 100644
--- a/ansible/roles/gpg/templates/gpg-agent.conf.j2
+++ b/ansible/roles/gpg/templates/gpg-agent.conf.j2
@@ -4,8 +4,8 @@ use-standard-socket
 default-cache-ttl 600
 max-cache-ttl 7200
 display :0
-{% if graphics_driver is defined and os_flavor == "linux" %}
+{% if install_graphics is defined and install_graphics and os_flavor == "linux" %}
 pinentry-program /usr/bin/pinentry-qt
-{% elif graphics_driver is defined and os_flavor == "freebsd" %}
+{% elif install_graphics is defined and install_graphics and os_flavor == "freebsd" %}
 pinentry-program /usr/local/bin/pinentry-qt5
 {% endif %}
diff --git a/ansible/roles/graphics/tasks/main.yaml b/ansible/roles/graphics/tasks/main.yaml
index dc9939d..9123a57 100644
--- a/ansible/roles/graphics/tasks/main.yaml
+++ b/ansible/roles/graphics/tasks/main.yaml
@@ -1,2 +1,2 @@
 - import_tasks: tasks/common.yaml
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics
diff --git a/ansible/roles/sway/tasks/main.yaml b/ansible/roles/sway/tasks/main.yaml
index dc9939d..9123a57 100644
--- a/ansible/roles/sway/tasks/main.yaml
+++ b/ansible/roles/sway/tasks/main.yaml
@@ -1,2 +1,2 @@
 - import_tasks: tasks/common.yaml
-  when: graphics_driver is defined
+  when: install_graphics is defined and install_graphics