Merge f0ea11480d3ac68549bb276c3c476b53ecd29068 into 75aac52edad09eb5f0cdcbe05bcd1c41f83cb28e

salt/ansible/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/ansible/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
   - dotfiles.copy-sh
   - dotfiles.copy-x11

salt/browser/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/browser/install-chrome.sls

@@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-chrome-repo
-  - .install-common
+  - {{ slsdotpath }}.install-chrome-repo
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-avoid-chrome-installing-own-repo":
   file.touch:

salt/browser/install-chromium.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-installed-chromium":
   pkg.installed:

salt/browser/install-firefox-esr.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-installed-firefox-esr":
   pkg.installed:

salt/browser/install-firefox.sls

@@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-firefox-repo
-  - .install-common
+  - {{ slsdotpath }}.install-firefox-repo
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-installed-firefox":
   pkg.installed:

salt/browser/install-lynx.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-installed-lynx":
   pkg.installed:

salt/browser/install-mullvad.sls

@@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-mullvad-repo
-  - .install-common
+  - {{ slsdotpath }}.install-mullvad-repo
+  - {{ slsdotpath }}.install-common
 
 "{{ slsdotpath }}-installed-mullvad":
   pkg.installed:

salt/browser/install-w3m.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
   - dotfiles.copy-net
 
 "{{ slsdotpath }}-installed-w3m":

salt/browser/install.sls

@@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-chromium
+  - {{ slsdotpath }}.install-chromium
 
 {% endif -%}

salt/debian-minimal/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/debian-xfce/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/debian/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/dev/configure.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .home-cleanup
+  - {{ slsdotpath }}.home-cleanup
   - dotfiles.copy-all
 
 {% endif -%}

salt/dev/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - sys-net.show-updatevm-origin
 
 {% load_yaml as defaults -%}

salt/dev/init.sls

@@ -11,12 +11,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {#
 include:
 {% if grains['id'] == 'dom0' -%}
-  - .create
+  - {{ slsdotpath }}.create
 {% elif grains['id'] == 'tpl-' ~ slsdotpath -%}
-  - .install
+  - {{ slsdotpath }}.install
 {% elif grains['id'] == 'disp-' ~ slsdotpath -%}
   - utils.tools.zsh.touch-zshrc
 {% elif grains['id'] == slsdotpath -%}
-  - .configure
+  - {{ slsdotpath }}.configure
 {% endif -%}
 #}

salt/dev/install.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .home-cleanup
+  - {{ slsdotpath }}.home-cleanup
   - dotfiles.copy-all
   - utils.tools.zsh
   - sys-pgp.install-client

salt/dom0/init.sls

@@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] == 'dom0' -%}
 
 include:
-  - .backup
-  - .dotfiles
-  - .helpers
-  - .install
-  - .desktop-kde
-  - .update-settings
-  - .xorg
-  - .screenshot
+  - {{ slsdotpath }}.backup
+  - {{ slsdotpath }}.dotfiles
+  - {{ slsdotpath }}.helpers
+  - {{ slsdotpath }}.install
+  - {{ slsdotpath }}.desktop-kde
+  - {{ slsdotpath }}.update-settings
+  - {{ slsdotpath }}.xorg
+  - {{ slsdotpath }}.screenshot
 
 {% endif -%}

salt/electrum/configure-hot.sls

@@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .configure-common
+  - {{ slsdotpath }}.configure-common
 
 {% endif -%}

salt/electrum/configure.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .configure-common
+  - {{ slsdotpath }}.configure-common
   - whonix-workstation.configure-offline
 
 {% endif -%}

salt/electrum/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import "whonix-workstation/template.jinja" as whonix_workstation -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - sys-bitcoin.create
 
 {% load_yaml as defaults -%}

salt/element/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/element/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
   - sys-audio.install-client
 

salt/fedora-minimal/create.sls

@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - fedora.create
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/fedora-minimal/prefs.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .create
+  - {{ slsdotpath }}.create
 
 "{{ slsdotpath }}-set-management_dispvm-to-default":
   qvm.vm:

salt/fedora-xfce/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/fedora/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "dvm-{{ template.template }}-absent":
   qvm.absent:

salt/fetcher/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/kicksecure-minimal/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: {{ template.template }}

salt/kicksecure-minimal/kernel-default.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: {{ template.template }}

salt/kicksecure-minimal/kernel-hvm.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: {{ template.template }}

salt/kicksecure-minimal/kernel-pv.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - utils.tools.common.update
 
 "{{ slsdotpath }}-installed":

salt/mail/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}-fetcher

salt/media/create.sls

@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import "debian-minimal/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/mgmt/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - fedora.create
-  - .clone
+  - {{ slsdotpath }}.clone
   - fedora-minimal.prefs
 
 {% load_yaml as defaults -%}

salt/mgmt/prefs.sls

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 include:
-  - .create
+  - {{ slsdotpath }}.create
 
 "{{ slsdotpath }}-set-qubes-prefs-management_dispvm-to-dvm-{{ slsdotpath }}":
   cmd.run:

salt/mirage-builder/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/opentofu/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/opentofu/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
   - sys-ssh-agent.install-client
 

salt/qubes-builder/configure-qusal.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .configure
+  - {{ slsdotpath }}.configure
 
 "{{ slsdotpath }}-makedir-qusal-builder":
   file.directory:

salt/qubes-builder/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - fedora-minimal.prefs
 
 {% load_yaml as defaults -%}

salt/qubes-builder/init.sls

@@ -6,11 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
 {% if grains['id'] == 'dom0' -%}
-  - .create
+  - {{ slsdotpath }}.create
 {% elif grains['id'] == 'tpl-' ~ slsdotpath -%}
-  - .install
+  - {{ slsdotpath }}.install
 {% elif grains['id'] == 'dvm-' ~ slsdotpath -%}
-  - .configure-qubes-executor
+  - {{ slsdotpath }}.configure-qubes-executor
 {% elif grains['id'] == slsdotpath -%}
-  - .configure
+  - {{ slsdotpath }}.configure
 {% endif -%}

salt/qubes-builder/install.sls

@@ -18,7 +18,7 @@ include:
   - sys-pgp.install-client
   - sys-ssh-agent.install-client
   - docker.install
-  - .install-qubes-executor
+  - {{ slsdotpath }}.install-qubes-executor
 
 "{{ slsdotpath }}-installed":
   pkg.installed:

salt/qubes-builder/prefs.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 ## https://github.com/QubesOS/qubes-issues/issues/8806
 
 include:
-  - .create
+  - {{ slsdotpath }}.create
 
 "{{ slsdotpath }}-set-management_dispvm-to-default":
   qvm.vm:

salt/reader/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/remmina/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/signal/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/signal/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
   - utils.tools.xfce
   - dotfiles.copy-x11

salt/ssh/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-audio/create.sls

@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-audio/install-bluetooth.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .install
+  - {{ slsdotpath }}.install
   - sys-usb.install-client-proxy
 
 "{{ slsdotpath }}-bluetooth-installed":

salt/sys-audio/install.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
   - utils.tools.common.update
   - sys-usb.install-client-proxy
-  - .install-client
+  - {{ slsdotpath }}.install-client
 
 "{{ slsdotpath }}-installed":
   pkg.installed:

salt/sys-bitcoin/configure-builder-source.sls

@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% set bitcoin_tag = 'v' ~ version.version -%}
 
 include:
-  - .configure-builder-common
+  - {{ slsdotpath }}.configure-builder-common
 
 "{{ slsdotpath }}-source-makedir-src":
   file.directory:

salt/sys-bitcoin/configure-builder.sls

@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% set bitcoin_url_shasum_sig = bitcoin_url_dir ~ bitcoin_file_shasum_sig -%}
 
 include:
-  - .configure-builder-common
+  - {{ slsdotpath }}.configure-builder-common
 
 "{{ slsdotpath }}-remove-failed-download-or-verification":
   file.absent:

salt/sys-bitcoin/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import "whonix-gateway/template.jinja" as whonix_gateway %}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: {{ slsdotpath }}-gateway

salt/sys-bitcoin/install-client.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
   - dev.home-cleanup
   - dotfiles.copy-x11
   - dotfiles.copy-sh

salt/sys-bitcoin/install-source.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .install-common
+  - {{ slsdotpath }}.install-common
   - dotfiles.copy-ssh
   - dotfiles.copy-git
   - sys-git.install-client

salt/sys-bitcoin/install.sls

@@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-common
+  - {{ slsdotpath }}.install-common
 
 {% endif -%}

salt/sys-cacher/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - browser.create
 
 {% load_yaml as defaults -%}

salt/sys-electrs/configure-builder.sls

@@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .configure-builder-source
+  - {{ slsdotpath }}.configure-builder-source
 
 {% endif -%}

salt/sys-electrs/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - sys-bitcoin.create
 
 {% load_yaml as defaults -%}

salt/sys-electrs/install-builder.sls

@@ -9,6 +9,6 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-builder-source
+  - {{ slsdotpath }}.install-builder-source
 
 {% endif -%}

salt/sys-electrs/install.sls

@@ -9,6 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 ## ElectRS does not provide official binaries. This state exists to be the
 ## default installation.
 include:
-  - .install-source
+  - {{ slsdotpath }}.install-source
 
 {% endif -%}

salt/sys-electrumx/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - sys-bitcoin.create
 
 {% load_yaml as defaults -%}

salt/sys-firewall/create.sls

@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% endif -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-git/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-gui-gpu/create.sls

@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-2.0-only
 {%- from "qvm/template-gui.jinja" import gui_common -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 "{{ slsdotpath }}-installed":
   pkg.installed:

salt/sys-gui-vnc/create.sls

@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-only
 {%- from "qvm/template-gui.jinja" import gui_common -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% if 'psu' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) %}
 "{{ slsdotpath }}-installed":

salt/sys-gui/cancel.sls

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 include:
-  - .cancel-common
+  - {{ slsdotpath }}.cancel-common
 
 "{{ slsdotpath }}-disable-autostart":
   qvm.prefs:

salt/sys-gui/create.sls

@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-only
 {%- from "qvm/template-gui.jinja" import gui_common -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% if 'psu' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) %}
 "{{ slsdotpath }}-installed":

salt/sys-net/create.sls

@@ -9,8 +9,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% set net_pcidevs = salt['grains.get']('pci_net_devs', []) -%}
 
 include:
-  - .clone
-  - .show-updatevm-origin
+  - {{ slsdotpath }}.clone
+  - {{ slsdotpath }}.show-updatevm-origin
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-pgp/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - fedora-minimal.prefs
 
 {% load_yaml as defaults -%}

salt/sys-pgp/install-client.sls

@@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install
+  - {{ slsdotpath }}.install
 
 {% endif -%}

salt/sys-pgp/prefs.sls

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 include:
-  - .create
+  - {{ slsdotpath }}.create
 
 "{{ slsdotpath }}-set-management_dispvm-to-default":
   qvm.vm:

salt/sys-print/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-rsync/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-ssh-agent/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-ssh/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-syncthing/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - browser.create
   - dom0.port-forward
 

salt/sys-syncthing/install-client.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 {% if grains['os_family']|lower == 'debian' -%}
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
 {% endif -%}
 

salt/sys-syncthing/install.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
 {% if grains['os_family']|lower == 'debian' -%}
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
 {% endif -%}
   - utils.tools.xfce

salt/sys-tailscale/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/sys-tailscale/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
 
 "{{ slsdotpath }}-systemd":

salt/sys-usb/create.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - utils.tools.common.update
   - qvm.hide-usb-from-dom0
 

salt/sys-usb/install-client-cryptsetup.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .install-client-proxy
+  - {{ slsdotpath }}.install-client-proxy
 
 "{{ slsdotpath }}-installed-cryptsetup":
   pkg.installed:

salt/sys-usb/install-client-fido.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .install-client-proxy
+  - {{ slsdotpath }}.install-client-proxy
 
 "{{ slsdotpath }}-installed-fido":
   pkg.installed:

salt/sys-usb/install-client.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-client-cryptsetup
-  - .install-client-fido
+  - {{ slsdotpath }}.install-client-cryptsetup
+  - {{ slsdotpath }}.install-client-fido
 
 {% endif -%}

salt/sys-wireguard/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/terraform/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/terraform/install.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-repo
+  - {{ slsdotpath }}.install-repo
   - utils.tools.common.update
   - sys-ssh-agent.install-client
 

salt/usb/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/vault/create.sls

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- from "qvm/template.jinja" import load -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: tpl-{{ slsdotpath }}

salt/video-companion/install-receiver-debug.sls

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - utils.tools.common.update
-  - .install-receiver
+  - {{ slsdotpath }}.install-receiver
 
 "{{ slsdotpath }}-receiver-debug-installed":
   pkg.installed:

salt/whonix-gateway/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
 
 {% load_yaml as defaults -%}
 name: {{ template.template }}

salt/whonix-workstation/create.sls

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - .clone
+  - {{ slsdotpath }}.clone
   - whonix-gateway.create
 
 {% load_yaml as defaults -%}