From e4b233515b35cd077d7b29d7adeba9f49634b0d9 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Fri, 23 Sep 2022 10:49:22 +0100
Subject: [PATCH] Move Xorg config into qemu-guest.yml

---
 roles/freebsd/tasks/qemu-guest.yml |  5 +++++
 roles/freebsd/tasks/xorg.yml       | 12 ------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/roles/freebsd/tasks/qemu-guest.yml b/roles/freebsd/tasks/qemu-guest.yml
index c2af4a5..32e9ec5 100644
--- a/roles/freebsd/tasks/qemu-guest.yml
+++ b/roles/freebsd/tasks/qemu-guest.yml
@@ -19,6 +19,11 @@
     # utouch-kmod and xf86-input-evdev are needed for mouse in QEMU/KVM.
     name: utouch-kmod,xf86-input-evdev
     state: present
+- name: Set xorg screen
+  become: true
+  ansible.builtin.copy:
+    src: screen-qemu.conf
+    dest: /usr/local/etc/X11/xorg.conf.d/screen-qemu.conf
 - name: Enable utouch module
   become: true
   ansible.builtin.lineinfile:
diff --git a/roles/freebsd/tasks/xorg.yml b/roles/freebsd/tasks/xorg.yml
index 8b434d7..ab95cf6 100644
--- a/roles/freebsd/tasks/xorg.yml
+++ b/roles/freebsd/tasks/xorg.yml
@@ -19,15 +19,3 @@
     name: dbus
     state: started
     enabled: yes
-- name: Set xorg screen size for kvm/qemu
-  become: true
-  ansible.builtin.copy:
-    src: screen-qemu.conf
-    dest: /usr/local/etc/X11/xorg.conf.d/screen-qemu.conf
-  when: ansible_virtualization_role == "guest" and ansible_virtualization_type == "kvm"
-- name: Enable SDDM
-  become: true
-  ansible.builtin.lineinfile:
-    path: /etc/rc.conf.d/ansible-workstation
-    regexp: '^sddm_enable=.*'
-    line: 'sddm_enable="YES"'