From 6d238716088cc1612e93b580a35eafae464be699 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Fri, 12 Jan 2024 19:08:56 +0100
Subject: [PATCH] fix: sys-usb hide-usb-from-dom0 in keyboard state

---
 salt/sys-usb/create.sls   | 13 +++++++++++++
 salt/sys-usb/keyboard.sls | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/salt/sys-usb/create.sls b/salt/sys-usb/create.sls
index 234015a..1218110 100644
--- a/salt/sys-usb/create.sls
+++ b/salt/sys-usb/create.sls
@@ -9,6 +9,19 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - .clone
+  - qvm.hide-usb-from-dom0
+
+"{{ slsdotpath }}-updated-dom0":
+  pkg.uptodate:
+    - refresh: True
+
+"{{ slsdotpath }}-installed-dom0":
+  pkg.installed:
+    - refresh: True
+    - install_recommends: False
+    - skip_suggestions: True
+    - pkgs:
+      - qubes-input-proxy
 
 {% load_yaml as defaults -%}
 name: dvm-{{ slsdotpath }}
diff --git a/salt/sys-usb/keyboard.sls b/salt/sys-usb/keyboard.sls
index e23c656..80350e6 100644
--- a/salt/sys-usb/keyboard.sls
+++ b/salt/sys-usb/keyboard.sls
@@ -9,19 +9,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 # 'qvm.sys-usb', which is different from the one we create at create.sls.
 # Last known update of 'qvm.usb-keyboard': 2023-08-31
 
-include:
-  - .create
-  - qvm.hide-usb-from-dom0
-
-"{{ slsdotpath }}-updated-dom0":
-  pkg.uptodate:
-    - refresh: True
-
-"{{ slsdotpath }}-installed-dom0":
-  pkg.installed:
-    - pkg:
-      - qubes-input-proxy
-
 {% set uefi_xen_cfg = '/boot/efi/EFI/qubes/xen.cfg' %}
 {% if grains['boot_mode'] == 'efi' %}
 {% set grub_cfg = '/boot/efi/EFI/qubes/grub.cfg' %}