fix: remove extraneous package repository updates

Updates happens multiple times, normally 2 to 3, even if we consider a state without includes. On states with multiple includes, it could easily get approximately 10 updates being ran. This behavior leads to unnecessary network bandwidth being spent and more time to run the installation state. When the connection is slow and not using the cacher, such as torified connections on Whonix, the installation can occurs much faster. Adding external repositories has to be done prior to update to ensure it is also fetched. Fixes: https://github.com/ben-grande/qusal/issues/29
2024-09-19 16:55:50 +00:00 · 2024-03-18 16:29:01 +01:00 · 2024-03-18 16:29:01 +01:00 · f9ead06408
commit f9ead06408
parent fc2af9b619
96 changed files with 480 additions and 446 deletions
--- a/docs/SALT.md
+++ b/docs/SALT.md
@ -169,14 +169,14 @@ features:
 {% if grains['nodename'] != 'dom0' %}

 {# Always update the package list before trying to install any package #}
-keys-updated:
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {# Install packages using Salt's pkg.installed module #}
 keys-installed:
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    {# Enforce that we don't want to install recommended packages #}
    - install_recommends: False
    {# Enforce that we don't want to install suggested packages #}
@ -200,7 +200,8 @@ keys-installed:
 {# Install the packages specific to the OS that this state is being applied #}
 keys-installed-os-specific:
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    {# Get the Jinja variable 'pkg.pkg' and convert it to an YAML list #}
--- a/salt/ansible/install-repo.sls
+++ b/salt/ansible/install-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'ansible') }}
+
+{% endif -%}
--- a/salt/ansible/install-repo.top
+++ b/salt/ansible/install-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-ansible':
+    - ansible.install-repo
--- a/salt/ansible/install.sls
+++ b/salt/ansible/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,16 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - .install-repo
+  - utils.tools.common.update
  - utils.tools.zsh
  - ssh.install

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -40,7 +40,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/browser/install-chrome-repo.sls
+++ b/salt/browser/install-chrome-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'chrome') }}
+
+{% endif -%}
--- a/salt/browser/install-chrome-repo.top
+++ b/salt/browser/install-chrome-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-browser':
+    - browser.install-chrome-repo
--- a/salt/browser/install-chrome.sls
+++ b/salt/browser/install-chrome.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,22 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - .install-chrome-repo
  - .install-common

-{% from 'utils/macros/install-repo.sls' import install_repo -%}
-{{ install_repo(sls_path, 'chrome') }}
-
 "{{ slsdotpath }}-avoid-chrome-installing-own-repo":
  file.touch:
    - name: /etc/default/google-chrome

-"{{ slsdotpath }}-updated-chrome":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-chrome":
  pkg.installed:
-    - refresh: True
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/browser/install-chromium.sls
+++ b/salt/browser/install-chromium.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
  - .install-common

-"{{ slsdotpath }}-updated-chromium":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-chromium":
  pkg.installed:
-    - refresh: True
+    - require:
+      - pkg: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/browser/install-common.sls
+++ b/salt/browser/install-common.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-usb.install-client-fido
  - sys-audio.install-client

-"{{ slsdotpath }}-updated-common":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-common":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/browser/install-firefox.sls
+++ b/salt/browser/install-firefox.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
  - .install-common

-"{{ slsdotpath }}-updated-firefox":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-firefox":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/browser/install-lynx.sls
+++ b/salt/browser/install-lynx.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
  - .install-common

-"{{ slsdotpath }}-updated-lynx":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-lynx":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/browser/install-w3m.sls
+++ b/salt/browser/install-w3m.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -10,13 +10,10 @@ include:
  - .install-common
  - dotfiles.copy-net

-"{{ slsdotpath }}-updated-w3m":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-w3m":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/debian-minimal/install.sls
+++ b/salt/debian-minimal/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,13 +7,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' and grains['os_family']|lower == 'debian' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11
  - dev.home-cleanup

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-configure-locale":
  file.replace:
    - name: /etc/locale.gen
--- a/salt/debian-xfce/install.sls
+++ b/salt/debian-xfce/install.sls
@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}
--- a/salt/debian/install.sls
+++ b/salt/debian/install.sls
@ -1,13 +1,12 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}
--- a/salt/dev/install-python-tools.sls
+++ b/salt/dev/install-python-tools.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated-python-tools":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed-python-tools":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/dev/install-salt-tools.sls
+++ b/salt/dev/install-salt-tools.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated-salt-tools":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed-salt-tools":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -29,7 +29,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 "{{ slsdotpath }}-installed-salt-tools-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/dev/install.sls
+++ b/salt/dev/install.sls
@ -7,9 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
-  {%- if salt['qvm.exists']('sys-cacher') %}
-  - sys-cacher.install-client
-  {% endif %}
+  - utils.tools.common.update
  - .home-cleanup
  - .install-python-tools
  - .install-salt-tools
@ -19,13 +17,10 @@ include:
  - sys-git.install-client
  - sys-ssh-agent.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -72,7 +67,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/docker/install.sls
+++ b/salt/docker/install.sls
@ -8,10 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 include:
  - docker.install-repo
-
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+  - utils.tools.common.update

 {% set pkg = {
    'Debian': {
@ -35,7 +32,9 @@ include:

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/dom0/install-dev.sls
+++ b/salt/dom0/install-dev.sls
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] == 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-git.install-client

-"{{ slsdotpath }}-dev-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-dev-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/dom0/install.sls
+++ b/salt/dom0/install.sls
@ -4,12 +4,9 @@ SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.co
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

-{%- from "qvm/template.jinja" import load -%}
-
 {% if grains['nodename'] == 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif -%}
--- a/salt/dom0/kde.sls
+++ b/salt/dom0/kde.sls
@ -1,17 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] == 'dom0' -%}

-"{{ slsdotpath }}-kde-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-kde-installed":
  pkg.installed:
+    - require:
+      - sls: utils.tools.common.update
    - pkgs:
      - kde-settings-qubes
      - sddm
--- a/salt/dom0/screenshot.sls
+++ b/salt/dom0/screenshot.sls
@ -6,15 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] == 'dom0' -%}

-"{{ slsdotpath }}-screenshot-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-screenshot-installed":
  pkg.installed:
    - require:
-      - pkg: "{{ slsdotpath }}-screenshot-updated"
-    - refresh: True
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/dom0/xorg.sls
+++ b/salt/dom0/xorg.sls
@ -1,17 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] == 'dom0' -%}

-"{{ slsdotpath }}-xorg-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-xorg-allow-custom-xsession-login":
  pkg.installed:
+    - require:
+      - sls: utils.tools.common.update
    - pkgs:
      - xorg-x11-xinit-session

--- a/salt/electrum/install-builder.sls
+++ b/salt/electrum/install-builder.sls
@ -7,20 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-x11
  - sys-pgp.install-client

-"{{ slsdotpath }}-builder-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-builder-installed":
  pkg.installed:
    - require:
-      - pkg: "{{ slsdotpath }}-builder-updated"
-    - refresh: True
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/electrum/install-distro.sls
+++ b/salt/electrum/install-distro.sls
@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-x11

-"{{ slsdotpath }}-distro-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-distro-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/electrum/install.sls
+++ b/salt/electrum/install.sls
@ -7,14 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-x11

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-remove-distro-package":
  pkg.removed:
    - pkgs:
@ -24,9 +21,8 @@ include:
 "{{ slsdotpath }}-installed":
  pkg.installed:
    - require:
+      - sls: utils.tools.common.update
      - pkg: "{{ slsdotpath }}-remove-distro-package"
-      - pkg: "{{ slsdotpath }}-updated"
-    - refresh: True
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/fedora-minimal/install.sls
+++ b/salt/fedora-minimal/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,10 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 {% endif %}
--- a/salt/fedora-xfce/install.sls
+++ b/salt/fedora-xfce/install.sls
@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}
--- a/salt/fedora/install.sls
+++ b/salt/fedora/install.sls
@ -1,13 +1,12 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}
--- a/salt/fetcher/install.sls
+++ b/salt/fetcher/install.sls
@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-sh
  - dotfiles.copy-x11
  - dotfiles.copy-net
  - sys-pgp.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/kicksecure-minimal/install-developers.sls
+++ b/salt/kicksecure-minimal/install-developers.sls
@ -16,15 +16,14 @@ https://www.qubes-os.org/doc/managing-vm-kernels/#distribution-kernel
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - kicksecure-minimal.install

-"{{ slsdotpath }}-developers-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-developers-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
+      - sls: kicksecure-minimal.install
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/kicksecure-minimal/install.sls
+++ b/salt/kicksecure-minimal/install.sls
@ -10,16 +10,15 @@ https://www.kicksecure.com/wiki/Debian

 include:
  - kicksecure-minimal.install-repo
+  - utils.tools.common.update
  - sys-cacher.install-client
  - utils.tools.zsh

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: kicksecure-minimal.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/kicksecure-minimal/kernel-pv.sls
+++ b/salt/kicksecure-minimal/kernel-pv.sls
@ -10,14 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 include:
  - .clone
-
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/mail/install-fetcher.sls
+++ b/salt/mail/install-fetcher.sls
@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' %}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11
  - dotfiles.copy-sh
  - dotfiles.copy-net

-"{{ slsdotpath }}-fetcher-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-fetcher-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
    - pkgs:
--- a/salt/mail/install-reader.sls
+++ b/salt/mail/install-reader.sls
@ -7,19 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' %}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11
  - dotfiles.copy-sh
  - dotfiles.copy-net
  - dotfiles.copy-mutt
  - sys-pgp.install-client

-"{{ slsdotpath }}-reader-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-reader-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
    - pkgs:
--- a/salt/mail/install-sender.sls
+++ b/salt/mail/install-sender.sls
@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' %}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11
  - dotfiles.copy-sh
  - dotfiles.copy-net

-"{{ slsdotpath }}-sender-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-sender-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
    - pkgs:
--- a/salt/media/install.sls
+++ b/salt/media/install.sls
@ -8,16 +8,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - browser.install
  - sys-audio.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/mgmt/install.sls
+++ b/salt/mgmt/install.sls
@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/mirage-builder/install.sls
+++ b/salt/mirage-builder/install.sls
@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-ssh
@ -16,13 +17,10 @@ include:
  - sys-ssh-agent.install-client
  - docker.install

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/opentofu/install-repo.sls
+++ b/salt/opentofu/install-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'opentofu') }}
+
+{% endif -%}
--- a/salt/opentofu/install-repo.top
+++ b/salt/opentofu/install-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-opentofu':
+    - opentofu.install-repo
--- a/salt/opentofu/install.sls
+++ b/salt/opentofu/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,18 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - .install-repo
+  - utils.tools.common.update
  - sys-ssh-agent.install-client

-{% from 'utils/macros/install-repo.sls' import install_repo -%}
-{{ install_repo(sls_path, 'opentofu') }}
-
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/qubes-builder/install-qubes-executor.sls
+++ b/salt/qubes-builder/install-qubes-executor.sls
@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated-qubes-executor":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed-qubes-executor":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/qubes-builder/install.sls
+++ b/salt/qubes-builder/install.sls
@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-git
  - dotfiles.copy-net
  - dotfiles.copy-pgp
@ -19,13 +20,10 @@ include:
  - docker.install
  - .install-qubes-executor

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/reader/install.sls
+++ b/salt/reader/install.sls
@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/remmina/install.sls
+++ b/salt/remmina/install.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/signal/install-repo.sls
+++ b/salt/signal/install-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'docker') }}
+
+{% endif -%}
--- a/salt/signal/install-repo.top
+++ b/salt/signal/install-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-qubes-builder':
+    - docker.install-repo
--- a/salt/signal/install.sls
+++ b/salt/signal/install.sls
@ -1,25 +1,22 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-{% from 'utils/macros/install-repo.sls' import install_repo -%}
-{{ install_repo(sls_path, 'signal') }}
-
 include:
+  - .install-repo
+  - utils.tools.common.update
  - dotfiles.copy-x11
  - sys-audio.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/ssh/install.sls
+++ b/salt/ssh/install.sls
@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-ssh-agent.install-client
  - dotfiles.copy-x11
  - dotfiles.copy-ssh

-"{{ slsdotpath }}-client-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-client-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -35,7 +33,8 @@ include:

 "{{ slsdotpath }}-client-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-audio/install-bluetooth.sls
+++ b/salt/sys-audio/install-bluetooth.sls
@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - .install
  - sys-usb.install-client-proxy

-"{{ slsdotpath }}-bluetooth-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-bluetooth-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-audio/install-client.sls
+++ b/salt/sys-audio/install-client.sls
@ -6,17 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-## qubes-usb-proxy: integrated camera and external USB.
 include:
+  - utils.tools.common.update
+  ## qubes-usb-proxy: integrated camera and external USB.
  - sys-usb.install-client-proxy

-"{{ slsdotpath }}-client-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-client-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -37,7 +35,8 @@ include:

 "{{ slsdotpath }}-client-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-audio/install.sls
+++ b/salt/sys-audio/install.sls
@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-usb.install-client-proxy
  - .install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -38,7 +36,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-bitcoin/install-common.sls
+++ b/salt/sys-bitcoin/install-common.sls
@ -7,19 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dev.install-terminal
  - dotfiles.copy-x11
  - dotfiles.copy-sh
  - whonix-workstation.install-nostart-tbb

-"{{ slsdotpath }}-common-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-common-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -47,7 +45,8 @@ include:

 "{{ slsdotpath }}-common-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-bitcoin/install-source.sls
+++ b/salt/sys-bitcoin/install-source.sls
@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - .install-common
  - dotfiles.copy-ssh
  - dotfiles.copy-git
@ -14,7 +15,8 @@ include:

 "{{ slsdotpath }}-source-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -36,7 +38,8 @@ include:

 "{{ slsdotpath }}-source-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
@ -53,7 +56,8 @@ include:

 "{{ slsdotpath }}-source-qt-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-cacher/install.sls
+++ b/salt/sys-cacher/install.sls
@ -1,24 +1,24 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

+include:
+  - utils.tools.common.update
+
 "{{ slsdotpath }}-allow-testing-repository":
  file.uncomment:
    - name: /etc/apt/sources.list.d/qubes-r4.list
    - regex: ^deb\s.*qubes-os.org.*-testing
    - backup: False

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-electrs/install-builder-source.sls
+++ b/salt/sys-electrs/install-builder-source.sls
@ -9,16 +9,14 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-git.install-client
  - sys-pgp.install-client

-"{{ slsdotpath }}-builder-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-builder-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-electrs/install-source.sls
+++ b/salt/sys-electrs/install-source.sls
@ -9,6 +9,7 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dev.install-terminal
  - dotfiles.copy-x11
@ -18,13 +19,10 @@ include:
  - sys-git.install-client
  - sys-pgp.install-client

-"{{ slsdotpath }}-source-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-source-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-electrumx/install-builder.sls
+++ b/salt/sys-electrumx/install-builder.sls
@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-x11
  - dotfiles.copy-sh
@ -14,13 +15,10 @@ include:
  - sys-pgp.install-client
  - sys-git.install-client

-"{{ slsdotpath }}-builder-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-builder-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-electrumx/install.sls
+++ b/salt/sys-electrumx/install.sls
@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-bitcoin.install-client
  - dev.home-cleanup
  - dev.install-terminal
@ -16,13 +17,10 @@ include:
  - sys-pgp.install-client
  - sys-git.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-firewall/create.sls
+++ b/salt/sys-firewall/create.sls
@ -128,7 +128,7 @@ features:

 {% set template_updatevm = salt['cmd.shell']("qrexec-policy tpl-sys-firewall @default qubes.UpdatesProxy 2>/dev/null | awk -F '=' '/^target=/{print $2}'") -%}
 {% if template_updatevm -%}
-"{{ slsdotpath }}-start-{{ template_updatevm }}-anticipate-network-use":
+"{{ slsdotpath }}-start-{{ template_updatevm }}-antecipate-network-use":
  qvm.start:
    - name: {{ template_updatevm }}
 {% endif -%}
--- a/salt/sys-firewall/install.sls
+++ b/salt/sys-firewall/install.sls
@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-git/install-client.sls
+++ b/salt/sys-git/install-client.sls
@ -5,18 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-git
  - dotfiles.copy-sh
  - dotfiles.copy-x11
  - sys-pgp.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-git/install.sls
+++ b/salt/sys-git/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-git
  - dotfiles.copy-sh
  - dotfiles.copy-x11
  - sys-pgp.install-client

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-net/install-debug.sls
+++ b/salt/sys-net/install-debug.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-net/install.sls
+++ b/salt/sys-net/install.sls
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-x11

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-pgp/install.sls
+++ b/salt/sys-pgp/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dotfiles.copy-pgp

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -35,7 +33,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-pihole/install.sls
+++ b/salt/sys-pihole/install.sls
@ -10,16 +10,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% set pihole_tag = 'v5.17.2' -%}

 include:
+  - utils.tools.common.update
  - sys-cacher.uninstall-client
  - dotfiles.copy-x11

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-rsync/install-client.sls
+++ b/salt/sys-rsync/install-client.sls
@ -1,19 +1,19 @@
 {#
 SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-client-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-client-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-rsync/install.sls
+++ b/salt/sys-rsync/install.sls
@ -1,19 +1,19 @@
 {#
 SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-ssh-agent/install-client.sls
+++ b/salt/sys-ssh-agent/install-client.sls
@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-ssh
  - dotfiles.copy-x11

-"{{ slsdotpath }}-client-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-client-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -37,7 +35,8 @@ include:

 "{{ slsdotpath }}-client-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-ssh-agent/install.sls
+++ b/salt/sys-ssh-agent/install.sls
@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup
  - dotfiles.copy-sh
  - dotfiles.copy-ssh
  - dotfiles.copy-x11

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -37,7 +35,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-ssh/install-client.sls
+++ b/salt/sys-ssh/install-client.sls
@ -1,6 +1,6 @@
 {#
 SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -8,12 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - sys-ssh-agent.install-client

-"{{ slsdotpath }}-client-updated":
-  pkg.uptodate:
-    - refresh: True
-
 {% set pkg = {
    'Debian': {
      'pkg': ['sshfs'],
@ -25,7 +22,8 @@ include:

 "{{ slsdotpath }}-client-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-ssh/install.sls
+++ b/salt/sys-ssh/install.sls
@ -1,19 +1,19 @@
 {#
 SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-syncthing/install-client.sls
+++ b/salt/sys-syncthing/install-client.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -30,7 +30,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/sys-syncthing/install-repo.sls
+++ b/salt/sys-syncthing/install-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'syncthing') }}
+
+{% endif -%}
--- a/salt/sys-syncthing/install-repo.top
+++ b/salt/sys-syncthing/install-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-sys-syncthing':
+    - sys-syncthing.install-repo
--- a/salt/sys-syncthing/install.sls
+++ b/salt/sys-syncthing/install.sls
@ -1,22 +1,21 @@
 {#
 SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-{% from 'utils/macros/install-repo.sls' import install_repo -%}
-{{ install_repo(sls_path, 'syncthing') }}
-
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - .install-repo
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-usb/create.sls
+++ b/salt/sys-usb/create.sls
@ -9,15 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 include:
  - .clone
+  - utils.tools.common.update
  - qvm.hide-usb-from-dom0

-"{{ slsdotpath }}-updated-dom0":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-dom0":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-usb/install-client-cryptsetup.sls
+++ b/salt/sys-usb/install-client-cryptsetup.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - .install-client-proxy

-"{{ slsdotpath }}-updated-cryptsetup":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-cryptsetup":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-usb/install-client-fido.sls
+++ b/salt/sys-usb/install-client-fido.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - .install-client-proxy

-"{{ slsdotpath }}-updated-fido":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed-fido":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-usb/install-client-proxy.sls
+++ b/salt/sys-usb/install-client-proxy.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated-proxy":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed-proxy":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-usb/install.sls
+++ b/salt/sys-usb/install.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/sys-wireguard/install.sls
+++ b/salt/sys-wireguard/install.sls
@ -7,6 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 {% if grains['nodename'] != 'dom0' -%}

+include:
+  - utils.tools.common.update
+
 {#
 "{{ slsdotpath }}-qvpn-group":
  group.present:
@ -14,13 +17,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
    - system: True
 #}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/terraform/install-repo.sls
+++ b/salt/terraform/install-repo.sls
@ -0,0 +1,12 @@
+{#
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+{% from 'utils/macros/install-repo.sls' import install_repo -%}
+{{ install_repo(sls_path, 'terraform') }}
+
+{% endif -%}
--- a/salt/terraform/install-repo.top
+++ b/salt/terraform/install-repo.top
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-terraform':
+    - terraform.install-repo
--- a/salt/terraform/install.sls
+++ b/salt/terraform/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,18 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - .install-repo
+  - utils.tools.common.update
  - sys-ssh-agent.install-client

-{% from 'utils/macros/install-repo.sls' import install_repo -%}
-{{ install_repo(sls_path, 'terraform') }}
-
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: {{ slsdotpath }}.install-repo
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/utils/macros/install-repo.sls
+++ b/salt/utils/macros/install-repo.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -39,8 +39,17 @@ If sls_path is 'browser', then this would install the repo from:
    - group: root
    - makedirs: True

+"{{ name }}-remove-{{ repo }}-old-format":
+  file.absent:
+    - require:
+      - file: "{{ name }}-install-{{ repo }}-keyring"
+    - name: /etc/apt/sources.list.d/{{ repo }}.list
+
 "{{ name }}-install-{{ repo }}-repository":
  file.managed:
+    - require:
+      - file: "{{ name }}-install-{{ repo }}-keyring"
+      - file: "{{ name }}-remove-{{ repo }}-old-format"
    - name: /etc/apt/sources.list.d/{{ repo }}.sources
    - source: salt://{{ name }}/files/repo/{{ repo }}.sources
    - mode: '0644'
@ -48,10 +57,6 @@ If sls_path is 'browser', then this would install the repo from:
    - group: root
    - makedirs: True

-"{{ name }}-remove-{{ repo }}-old-format":
-  file.absent:
-    - name: /etc/apt/sources.list.d/{{ repo }}.list
-
 {% elif grains['os_family']|lower == 'redhat' -%}

 "{{ name }}-install-{{ repo }}-keyring":
@ -65,6 +70,8 @@ If sls_path is 'browser', then this would install the repo from:

 "{{ name }}-install-{{ repo }}-repository":
  file.managed:
+    - require:
+      - file: "{{ name }}-install-{{ repo }}-keyring"
    - name: /etc/yum.repos.d/{{ repo }}.repo
    - source: salt://{{ name }}/files/repo/{{ repo }}.yum.repo
    - mode: '0644'
--- a/salt/utils/tools/builder/core.sls
+++ b/salt/utils/tools/builder/core.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-core-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-core-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -38,7 +38,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later

 "{{ slsdotpath }}-core-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/utils/tools/builder/doc.sls
+++ b/salt/utils/tools/builder/doc.sls
@ -1,18 +1,18 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-doc-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 "{{ slsdotpath }}-doc-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/utils/tools/common/update.sls
+++ b/salt/utils/tools/common/update.sls
@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+"common-updated":
+  pkg.uptodate:
+    - refresh: True
--- a/salt/utils/tools/zsh/install.sls
+++ b/salt/utils/tools/zsh/install.sls
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - utils.tools.zsh.touch-zshrc

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
--- a/salt/vault/install.sls
+++ b/salt/vault/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}

 include:
+  - utils.tools.common.update
  - dev.home-cleanup

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
 "{{ slsdotpath }}-installed":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs:
@ -33,7 +31,8 @@ include:

 "{{ slsdotpath }}-installed-os-specific":
  pkg.installed:
-    - refresh: True
+    - require:
+      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
    - pkgs: {{ pkg.pkg|sequence|yaml }}
--- a/salt/whonix-gateway/install.sls
+++ b/salt/whonix-gateway/install.sls
@ -1,13 +1,12 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}
--- a/salt/whonix-workstation/install.sls
+++ b/salt/whonix-workstation/install.sls
@ -1,13 +1,12 @@
 {#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: AGPL-3.0-or-later
 #}

 {% if grains['nodename'] != 'dom0' -%}

-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
+include:
+  - utils.tools.common.update

 {% endif %}