Tag for commit e827bf64d6

-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTv2l1+mgH6mb+gYuEAxk4U9R+eVgUCaHHrrAAKCRAAxk4U9R+e
 Vj7XAQCWh8H3MG7lghWzFZLDJGkVnZJkWAtv7LEFNH4+7m2GGAD+MeBPl872ZaWs
 wqi7OC6jX/QSu0QRltidbbO9TjioWAY=
 =ubcH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTv2l1+mgH6mb+gYuEAxk4U9R+eVgUCaHHrygAKCRAAxk4U9R+e
 VsjWAQCUqdhD4rnJGzmFdL9GNN/zZDFR7umTSW+ucifWRp1PpAD+KAmWcT9RL+ns
 LPdTtrnNp37ZM7Yl0HpY5fQkMq3PEgQ=
 =Woq0
 -----END PGP SIGNATURE-----

Merge tag 'signed_tag_for_e827bf64'

Tag for commit e827bf64d6

* tag 'signed_tag_for_e827bf64':
  feat: sys-gui-gpu: separate template for drivers

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`.
 

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) }}

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

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

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 -%}

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