fix: skip YUM weak dependencies installation

Fixes: https://github.com/ben-grande/qusal/issues/96
2024-10-01 02:35:49 -04:00 · 2024-08-16 14:02:53 +02:00 · 2024-08-16 14:02:53 +02:00 · 56a4296421
commit 56a4296421
parent c6582dfb88
90 changed files with 107 additions and 0 deletions
--- a/docs/SALT.md
+++ b/docs/SALT.md
@ -185,6 +185,7 @@ keys-installed:
    {# Enforce that we don't want to install suggested packages #}
    - skip_suggestions: True
    {# List of packages to be installed #}
+    - setopt: "install_weak_deps=False"
    - pkgs:
      {# Wait, some package names do not match on different distributions #}
      - keepassxc
@ -208,6 +209,7 @@ keys-installed-os-specific:
    - install_recommends: False
    - skip_suggestions: True
    {# Get the Jinja variable 'pkg.pkg' and convert it to an YAML list #}
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {# End our 'if' statement created above #}
--- a/salt/ansible/install.sls
+++ b/salt/ansible/install.sls
@ -22,6 +22,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
@ -48,6 +49,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/browser/install-chrome.sls
+++ b/salt/browser/install-chrome.sls
@ -21,6 +21,7 @@ include:
      - sls: {{ slsdotpath }}.install-chrome-repo
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - google-chrome-stable

--- a/salt/browser/install-chromium.sls
+++ b/salt/browser/install-chromium.sls
@ -15,6 +15,7 @@ include:
      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - chromium

--- a/salt/browser/install-common.sls
+++ b/salt/browser/install-common.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
@ -37,6 +38,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/browser/install-firefox-esr.sls
+++ b/salt/browser/install-firefox-esr.sls
@ -15,6 +15,7 @@ include:
      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - firefox-esr

--- a/salt/browser/install-firefox.sls
+++ b/salt/browser/install-firefox.sls
@ -17,6 +17,7 @@ include:
      - sls: {{ slsdotpath }}.install-firefox-repo
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - firefox

--- a/salt/browser/install-lynx.sls
+++ b/salt/browser/install-lynx.sls
@ -15,6 +15,7 @@ include:
      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - lynx

--- a/salt/browser/install-mullvad.sls
+++ b/salt/browser/install-mullvad.sls
@ -17,6 +17,7 @@ include:
      - sls: {{ slsdotpath }}.install-mullvad-repo
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - mullvad-browser

--- a/salt/browser/install-w3m.sls
+++ b/salt/browser/install-w3m.sls
@ -16,6 +16,7 @@ include:
      - sls: {{ slsdotpath }}.install-common
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - w3m

--- a/salt/dev/install-python-tools.sls
+++ b/salt/dev/install-python-tools.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - python3-dev
      - python3-venv
--- a/salt/dev/install.sls
+++ b/salt/dev/install.sls
@ -21,6 +21,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      ## Necessary
      - qubes-core-agent-passwordless-root
@ -65,6 +66,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/docker/install.sls
+++ b/salt/docker/install.sls
@ -27,6 +27,7 @@ include:
 {#
 "{{ slsdotpath }}-removed-os-specific":
  pkg.removed:
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg_removed|sequence|yaml }}
 #}

@ -37,6 +38,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - man-db
--- a/salt/dom0/desktop-awesome.sls
+++ b/salt/dom0/desktop-awesome.sls
@ -15,6 +15,7 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - awesome

--- a/salt/dom0/desktop-i3-settings.sls
+++ b/salt/dom0/desktop-i3-settings.sls
@ -15,6 +15,7 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - i3-settings-qubes

--- a/salt/dom0/desktop-i3.sls
+++ b/salt/dom0/desktop-i3.sls
@ -15,6 +15,7 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - i3

--- a/salt/dom0/desktop-kde.sls
+++ b/salt/dom0/desktop-kde.sls
@ -15,6 +15,7 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - kde-settings-qubes
      - sddm
--- a/salt/dom0/install-dev.sls
+++ b/salt/dom0/install-dev.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - vim
      - tmux
--- a/salt/dom0/screenshot.sls
+++ b/salt/dom0/screenshot.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - zenity
      - maim
--- a/salt/dom0/xorg.sls
+++ b/salt/dom0/xorg.sls
@ -13,6 +13,7 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - xorg-x11-xinit-session

--- a/salt/electrum/install-builder.sls
+++ b/salt/electrum/install-builder.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/electrum/install-distro.sls
+++ b/salt/electrum/install-distro.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - electrum
      - python3-pyqt5
--- a/salt/electrum/install.sls
+++ b/salt/electrum/install.sls
@ -14,6 +14,7 @@ include:

 "{{ slsdotpath }}-remove-distro-package":
  pkg.removed:
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - electrum
      - python3-electrum
@ -25,6 +26,7 @@ include:
      - pkg: "{{ slsdotpath }}-remove-distro-package"
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - socat
      - man-db
--- a/salt/element/install.sls
+++ b/salt/element/install.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/fetcher/install.sls
+++ b/salt/fetcher/install.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/kicksecure-minimal/install-developers.sls
+++ b/salt/kicksecure-minimal/install-developers.sls
@ -26,6 +26,7 @@ include:
      - sls: kicksecure-minimal.install
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-kernel-vm-support
      - linux-image-amd64
--- a/salt/kicksecure-minimal/install.sls
+++ b/salt/kicksecure-minimal/install.sls
@ -20,6 +20,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - kicksecure-qubes-cli

--- a/salt/kicksecure-minimal/kernel-pv.sls
+++ b/salt/kicksecure-minimal/kernel-pv.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - grub2-xen-pvh

--- a/salt/mail/install-fetcher.sls
+++ b/salt/mail/install-fetcher.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/mail/install-reader.sls
+++ b/salt/mail/install-reader.sls
@ -20,6 +20,7 @@ include:
      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-app-shutdown-idle
      - qubes-pdf-converter
--- a/salt/mail/install-sender.sls
+++ b/salt/mail/install-sender.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - skip_suggestions: True
    - install_recommends: False
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/media/install.sls
+++ b/salt/media/install.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-pdf-converter
      - qubes-img-converter
--- a/salt/mgmt/install.sls
+++ b/salt/mgmt/install.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-mgmt-salt-vm-connector
      - socat
--- a/salt/mirage-builder/install.sls
+++ b/salt/mirage-builder/install.sls
@ -23,6 +23,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      ## https://github.com/mirage/qubes-mirage-firewall/blob/main/Dockerfile
      - qubes-core-agent-networking
--- a/salt/opentofu/install.sls
+++ b/salt/opentofu/install.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/qubes-builder/install-dev.sls
+++ b/salt/qubes-builder/install-dev.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - vim-enhanced
      - tmux
--- a/salt/qubes-builder/install-qubes-executor.sls
+++ b/salt/qubes-builder/install-qubes-executor.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - qubes-core-agent-passwordless-root
--- a/salt/qubes-builder/install.sls
+++ b/salt/qubes-builder/install.sls
@ -26,6 +26,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      ## Minimal template dependencies
      - qubes-core-agent-networking
--- a/salt/reader/install.sls
+++ b/salt/reader/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-pdf-converter
      - qubes-img-converter
--- a/salt/remmina/install.sls
+++ b/salt/remmina/install.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/signal/install.sls
+++ b/salt/signal/install.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/sys-audio/install-bluetooth.sls
+++ b/salt/sys-audio/install-bluetooth.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - blueman
      - libspa-0.2-bluetooth
--- a/salt/sys-audio/install-client.sls
+++ b/salt/sys-audio/install-client.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - pipewire-qubes
      - wireplumber
@ -37,6 +38,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/sys-audio/install-easyeffects.sls
+++ b/salt/sys-audio/install-easyeffects.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - easyeffects

--- a/salt/sys-audio/install.sls
+++ b/salt/sys-audio/install.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-admin-client
      - qubes-audio-daemon
@ -40,6 +41,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/sys-bitcoin/install-common.sls
+++ b/salt/sys-bitcoin/install-common.sls
@ -20,6 +20,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
@ -49,6 +50,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 "{{ slsdotpath }}-bin":
--- a/salt/sys-bitcoin/install-source.sls
+++ b/salt/sys-bitcoin/install-source.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - clang
      - ccache
@ -42,6 +43,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% set pkg = {
@ -60,6 +62,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/sys-cacher/install.sls
+++ b/salt/sys-cacher/install.sls
@ -21,6 +21,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - qubes-app-shutdown-idle
--- a/salt/sys-electrs/install-builder-source.sls
+++ b/salt/sys-electrs/install-builder-source.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/sys-electrs/install-source.sls
+++ b/salt/sys-electrs/install-source.sls
@ -25,6 +25,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - socat
      - librocksdb-dev
--- a/salt/sys-electrumx/install-builder.sls
+++ b/salt/sys-electrumx/install-builder.sls
@ -21,6 +21,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/sys-electrumx/install.sls
+++ b/salt/sys-electrumx/install.sls
@ -23,6 +23,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - socat
      - python3-aiohttp
--- a/salt/sys-firewall/install.sls
+++ b/salt/sys-firewall/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - fwupd-qubes-vm
      - qubes-core-agent-dom0-updates
--- a/salt/sys-git/install-client.sls
+++ b/salt/sys-git/install-client.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - git
      - man-db
--- a/salt/sys-git/install.sls
+++ b/salt/sys-git/install.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - git
      - man-db
--- a/salt/sys-gui-gpu/create.sls
+++ b/salt/sys-gui-gpu/create.sls
@ -17,6 +17,7 @@ include:
  pkg.installed:
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-input-proxy-sender
      {% if 'psu' in salt['pillar.get']('qvm:sys-gui-gpu:dummy-modules', []) %}
--- a/salt/sys-gui-vnc/create.sls
+++ b/salt/sys-gui-vnc/create.sls
@ -17,6 +17,7 @@ include:
  pkg.installed:
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      {% if 'psu' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) %}
      - dummy-psu-sender
--- a/salt/sys-gui/create.sls
+++ b/salt/sys-gui/create.sls
@ -17,6 +17,7 @@ include:
  pkg.installed:
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      {% if 'psu' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) %}
      - dummy-psu-sender
--- a/salt/sys-gui/install.sls
+++ b/salt/sys-gui/install.sls
@ -20,6 +20,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      # Qubes related packages
      - qubes-core-agent-passwordless-root
@ -66,6 +67,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 "{{ slsdotpath }}-lightdm-service-unit":
--- a/salt/sys-net/install-debug.sls
+++ b/salt/sys-net/install-debug.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - net-tools
      - wireless-tools
--- a/salt/sys-net/install-proxy.sls
+++ b/salt/sys-net/install-proxy.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - socat

--- a/salt/sys-net/install.sls
+++ b/salt/sys-net/install.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-network-manager
      - wpasupplicant
--- a/salt/sys-pgp/install.sls
+++ b/salt/sys-pgp/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - split-gpg2
      - gnupg2
@ -38,6 +39,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/sys-pihole/install.sls
+++ b/salt/sys-pihole/install.sls
@ -21,6 +21,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - fwupd-qubes-vm
      - qubes-core-agent-passwordless-root
--- a/salt/sys-print/install-driver-all.sls
+++ b/salt/sys-print/install-driver-all.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - printer-driver-all-enforce

--- a/salt/sys-print/install.sls
+++ b/salt/sys-print/install.sls
@ -20,6 +20,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      ## Discovery
      - qubes-core-agent-networking
--- a/salt/sys-rsync/install-client.sls
+++ b/salt/sys-rsync/install-client.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - rsync
      - man-db
--- a/salt/sys-rsync/install.sls
+++ b/salt/sys-rsync/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - rsync
      - man-db
--- a/salt/sys-ssh-agent/install-client.sls
+++ b/salt/sys-ssh-agent/install-client.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
@ -40,6 +41,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 "{{ slsdotpath }}-client-system-systemd-dir":
--- a/salt/sys-ssh-agent/install.sls
+++ b/salt/sys-ssh-agent/install.sls
@ -19,6 +19,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - socat
      - man-db
@ -38,6 +39,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 "{{ slsdotpath }}-agent-bin-dir":
--- a/salt/sys-ssh/install-client.sls
+++ b/salt/sys-ssh/install-client.sls
@ -26,6 +26,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 "{{ slsdotpath }}-ssh-config":
--- a/salt/sys-ssh/install.sls
+++ b/salt/sys-ssh/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - openssh-server
      - man-db
--- a/salt/sys-syncthing/install-client.sls
+++ b/salt/sys-syncthing/install-client.sls
@ -21,6 +21,7 @@ include:
    {% endif %}
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - syncthing
      - jq
--- a/salt/sys-syncthing/install.sls
+++ b/salt/sys-syncthing/install.sls
@ -22,6 +22,7 @@ include:
    {% endif %}
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - syncthing
--- a/salt/sys-tailscale/install.sls
+++ b/salt/sys-tailscale/install.sls
@ -28,6 +28,7 @@ include:
      - file: "{{ slsdotpath }}-systemd"
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - qubes-core-agent-passwordless-root
--- a/salt/sys-usb/create.sls
+++ b/salt/sys-usb/create.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-input-proxy

--- a/salt/sys-usb/install-client-cryptsetup.sls
+++ b/salt/sys-usb/install-client-cryptsetup.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - cryptsetup

--- a/salt/sys-usb/install-client-fido.sls
+++ b/salt/sys-usb/install-client-fido.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-ctap

--- a/salt/sys-usb/install-client-proxy.sls
+++ b/salt/sys-usb/install-client-proxy.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-usb-proxy
      - pciutils
--- a/salt/sys-usb/install.sls
+++ b/salt/sys-usb/install.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - pciutils
      - qubes-input-proxy-sender
--- a/salt/sys-wireguard/install.sls
+++ b/salt/sys-wireguard/install.sls
@ -17,6 +17,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/terraform/install.sls
+++ b/salt/terraform/install.sls
@ -18,6 +18,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - ca-certificates
--- a/salt/utils/tools/builder/core.sls
+++ b/salt/utils/tools/builder/core.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-core-agent-networking
      - qubes-core-agent-passwordless-root
@ -42,6 +43,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/utils/tools/builder/doc.sls
+++ b/salt/utils/tools/builder/doc.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - pandoc
      - ronn
--- a/salt/utils/tools/zsh/install.sls
+++ b/salt/utils/tools/zsh/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - zsh
      - zsh-autosuggestions
--- a/salt/vault/install.sls
+++ b/salt/vault/install.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - keepassxc
      - gnupg2
@ -36,6 +37,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs: {{ pkg.pkg|sequence|yaml }}

 {% endif -%}
--- a/salt/video-companion/create.sls
+++ b/salt/video-companion/create.sls
@ -11,5 +11,6 @@ include:
  pkg.installed:
    - require:
      - sls: utils.tools.common.update
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - qubes-video-companion-dom0
--- a/salt/video-companion/install-receiver-debug.sls
+++ b/salt/video-companion/install-receiver-debug.sls
@ -16,6 +16,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      - cheese

--- a/salt/video-companion/install-receiver.sls
+++ b/salt/video-companion/install-receiver.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      {% if grains['os_family']|lower == 'debian' -%}
      - qubes-video-companion
--- a/salt/video-companion/install-sender.sls
+++ b/salt/video-companion/install-sender.sls
@ -15,6 +15,7 @@ include:
      - sls: utils.tools.common.update
    - install_recommends: False
    - skip_suggestions: True
+    - setopt: "install_weak_deps=False"
    - pkgs:
      {% if grains['os_family']|lower == 'debian' -%}
      - qubes-video-companion