From 8059435b573abf1e3304bd9e66c0e3fd7c7ee41a Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Thu, 4 Jan 2024 17:25:56 +0100
Subject: [PATCH] fix: changes default template flavor to Xfce

---
 salt/debian-minimal/template.jinja | 9 +++++++--
 salt/debian/template.jinja         | 9 +++++++--
 salt/fedora-minimal/template.jinja | 9 +++++++--
 salt/fedora/template.jinja         | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/salt/debian-minimal/template.jinja b/salt/debian-minimal/template.jinja
index e2f6503..367da23 100644
--- a/salt/debian-minimal/template.jinja
+++ b/salt/debian-minimal/template.jinja
@@ -5,7 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 {%- import "debian/template.jinja" as template_base -%}
+{% set base = template_base.base -%}
 {% set version = template_base.version -%}
+{% set flavor = 'minimal' -%}
 {% set repo = template_base.repo -%}
-{% set template = template_base.template ~ '-minimal' -%}
-{% set template_clean = template_base.template_clean ~ '-minimal' -%}
+{% if flavor -%}
+  {% set flavor = '-' ~ flavor -%}
+{% endif -%}
+{% set template = base ~ '-' ~ version ~ flavor -%}
+{% set template_clean = base ~ flavor -%}
diff --git a/salt/debian/template.jinja b/salt/debian/template.jinja
index cf8da9a..c3f4432 100644
--- a/salt/debian/template.jinja
+++ b/salt/debian/template.jinja
@@ -4,7 +4,12 @@ SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
+{% set base = 'debian' -%}
 {% set version = salt['pillar.get']('qvm:debian:version', '12') -%}
+{% set flavor = salt['pillar.get']('qvm:debian:flavor', 'xfce') -%}
 {% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%}
-{% set template = 'debian-' ~ version -%}
-{% set template_clean = 'debian' -%}
+{% if flavor -%}
+  {% set flavor = '-' ~ flavor -%}
+{% endif -%}
+{% set template = base  ~ '-' ~ version ~ flavor -%}
+{% set template_clean = base ~ flavor -%}
diff --git a/salt/fedora-minimal/template.jinja b/salt/fedora-minimal/template.jinja
index b5abf37..4e4a890 100644
--- a/salt/fedora-minimal/template.jinja
+++ b/salt/fedora-minimal/template.jinja
@@ -5,7 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 {%- import "fedora/template.jinja" as template_base -%}
+{% set base = template_base.base -%}
 {% set version = template_base.version -%}
+{% set flavor = 'minimal' -%}
 {% set repo = template_base.repo -%}
-{% set template = template_base.template ~ '-minimal' -%}
-{% set template_clean = template_base.template_clean ~ '-minimal' -%}
+{% if flavor -%}
+  {% set flavor = '-' ~ flavor -%}
+{% endif -%}
+{% set template = base ~ '-' ~ version ~ flavor -%}
+{% set template_clean = base ~ flavor -%}
diff --git a/salt/fedora/template.jinja b/salt/fedora/template.jinja
index 8f3448e..6228ee9 100644
--- a/salt/fedora/template.jinja
+++ b/salt/fedora/template.jinja
@@ -4,7 +4,12 @@ SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
+{% set base = 'fedora' -%}
 {% set version = salt['pillar.get']('qvm:fedora:version', '38') -%}
+{% set flavor = salt['pillar.get']('qvm:fedora:flavor', 'xfce') -%}
 {% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%}
-{% set template = 'fedora-' ~ version -%}
-{% set template_clean = 'fedora' -%}
+{% if flavor -%}
+  {% set flavor = '-' ~ flavor -%}
+{% endif -%}
+{% set template = base  ~ '-' ~ version ~ flavor -%}
+{% set template_clean = base ~ flavor -%}