From e827bf64d6c37f9a85a2ce09bb2f266cd6c92fc2 Mon Sep 17 00:00:00 2001
From: 3np <3np@example.com>
Date: Thu, 26 Jun 2025 21:55:19 +0000
Subject: [PATCH] feat: sys-gui-gpu: separate template for drivers

Co-authored-by: Ben Grande <ben.grande.b@gmail.com>
---
 salt/sys-gui-gpu/README.md   | 17 +++++++++++++++--
 salt/sys-gui-gpu/clone.sls   |  4 ++--
 salt/sys-gui-gpu/create.sls  | 17 +++++++++++++----
 salt/sys-gui-gpu/init.top    |  2 +-
 salt/sys-gui-gpu/install.sls | 23 +++++++++++++++++++++++
 salt/sys-gui-gpu/install.top |  2 +-
 6 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/salt/sys-gui-gpu/README.md b/salt/sys-gui-gpu/README.md
index 1ba6bee..21c3c07 100644
--- a/salt/sys-gui-gpu/README.md
+++ b/salt/sys-gui-gpu/README.md
@@ -26,7 +26,7 @@ sudo qubesctl top.enable qvm.sys-gui-gpu pillar=True
 sudo qubesctl top.enable mgmt sys-gui-gpu
 sudo qubesctl --targets=tpl-mgmt state.apply
 sudo qubesctl state.apply sys-gui.prefs-mgmt
-sudo qubesctl --targets=tpl-sys-gui,sys-gui-gpu state.apply
+sudo qubesctl --targets=tpl-sys-gui-gpu,sys-gui-gpu state.apply
 sudo qubesctl top.disable mgmt sys-gui-gpu
 sudo qubesctl state.apply sys-gui-gpu.prefs
 ```
@@ -40,7 +40,7 @@ sudo qubesctl top.enable qvm.sys-gui-gpu pillar=True
 sudo qubesctl state.apply sys-gui-gpu.create
 sudo qubesctl --skip-dom0 --targets=tpl-mgmt state.apply mgmt.install
 sudo qubesctl state.apply sys-gui.prefs-mgmt
-sudo qubesctl --skip-dom0 --targets=tpl-sys-gui state.apply sys-gui-gpu.install
+sudo qubesctl --skip-dom0 --targets=tpl-sys-gui-gpu state.apply sys-gui-gpu.install
 sudo qubesctl --skip-dom0 --targets=sys-gui-gpu state.apply sys-gui-gpu.configure
 sudo qubesctl state.apply sys-gui-gpu.prefs
 ```
@@ -52,6 +52,19 @@ vendor, please use
 [qvm-pci](https://www.qubes-os.org/doc/how-to-use-pci-devices/#qvm-pci-usage)
 to persistently attach the GPU with the permissive option to `sys-gui-gpu`.
 
+Identify PCI device identifier:
+
+```sh
+qvm-pci ls -v
+```
+
+Assign device for persistent attachment (assuming the `backend:devid`
+combination is `dom0:00_02.1-00_00.0`):
+
+```sh
+qvm-assign -v -o permissive=True -o no-strict-reset=True -r sys-gui-gpu dom0:00_02.1-00_00.0
+```
+
 Shutdown all your running qubes as the global property `default_guivm` has
 changed to `sys-gui-gpu`.
 
diff --git a/salt/sys-gui-gpu/clone.sls b/salt/sys-gui-gpu/clone.sls
index de43c2e..8805ae5 100644
--- a/salt/sys-gui-gpu/clone.sls
+++ b/salt/sys-gui-gpu/clone.sls
@@ -4,5 +4,5 @@ SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.co
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
-include:
-  - sys-gui.clone
+{% from 'utils/macros/clone-template.sls' import clone_template -%}
+{{ clone_template('fedora-minimal', sls_path) }}
diff --git a/salt/sys-gui-gpu/create.sls b/salt/sys-gui-gpu/create.sls
index 31cc7a4..3fc9019 100644
--- a/salt/sys-gui-gpu/create.sls
+++ b/salt/sys-gui-gpu/create.sls
@@ -12,7 +12,6 @@ SPDX-License-Identifier: GPL-2.0-only
 
 include:
   - {{ slsdotpath }}.clone
-  - sys-gui.create
 
 "{{ slsdotpath }}-installed":
   pkg.installed:
@@ -25,16 +24,26 @@ include:
       - dummy-psu-sender
       {% endif %}
 
+{% load_yaml as defaults -%}
+name: tpl-{{ slsdotpath }}
+force: True
+require:
+- sls: {{ slsdotpath }}.clone
+prefs:
+- audiovm: ""
+{%- endload %}
+{{ load(defaults) }}
+
 {% load_yaml as defaults -%}
 name: {{ slsdotpath }}
 force: True
 require:
-- qvm: tpl-sys-gui
+- qvm: tpl-{{ slsdotpath }}
 present:
-- template: tpl-sys-gui
+- template: tpl-{{ slsdotpath }}
 - label: black
 prefs:
-- template: tpl-sys-gui
+- template: tpl-{{ slsdotpath }}
 - label: black
 - memory: 600
 - maxmem: 4000
diff --git a/salt/sys-gui-gpu/init.top b/salt/sys-gui-gpu/init.top
index 294a784..7c9a8f3 100644
--- a/salt/sys-gui-gpu/init.top
+++ b/salt/sys-gui-gpu/init.top
@@ -8,7 +8,7 @@ base:
   'dom0':
     - match: nodegroup
     - sys-gui-gpu.create
-  'tpl-sys-gui':
+  'tpl-sys-gui-gpu':
     - sys-gui-gpu.install
   'sys-gui-gpu':
     - sys-gui-gpu.configure
diff --git a/salt/sys-gui-gpu/install.sls b/salt/sys-gui-gpu/install.sls
index a54ba17..a0ace58 100644
--- a/salt/sys-gui-gpu/install.sls
+++ b/salt/sys-gui-gpu/install.sls
@@ -13,4 +13,27 @@ Upstream pkg.installed install weak_deps/recommends.
 include:
   - sys-gui.install
 
+"{{ slsdotpath }}-installed":
+  pkg.installed:
+    - require:
+      - sls: sys-gui.install
+    - install_recommends: False
+    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
+    - pkgs:
+      - pciutils
+      - lshw
+      - linux-firmware
+      - amd-gpu-firmware
+      - amd-ucode-firmware
+      - xorg-x11-drv-amdgpu
+      - radeontop
+      - nvidia-gpu-firmware
+      - libva-nvidia-driver
+      - xorg-x11-drv-nouveau
+      - intel-gpu-firmware
+      - libva-intel-hybrid-driver
+      - libva-intel-media-driver
+      - xorg-x11-drv-intel
+
 {% endif -%}
diff --git a/salt/sys-gui-gpu/install.top b/salt/sys-gui-gpu/install.top
index 9486e22..037c3b9 100644
--- a/salt/sys-gui-gpu/install.top
+++ b/salt/sys-gui-gpu/install.top
@@ -5,5 +5,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 base:
-  'tpl-sys-gui':
+  'tpl-sys-gui-gpu':
     - sys-gui-gpu.install