diff --git a/salt/dev/README.md b/salt/dev/README.md index f554de6..9c4192e 100644 --- a/salt/dev/README.md +++ b/salt/dev/README.md @@ -43,6 +43,11 @@ fi ``` +If you want some Python goodies, you can install them: +```sh +sudo qubesctl --skip-dom0 --targets=tpl-dev state.apply dev.install-python-tools +``` + The installation will make the Qusal TCP Proxy available in the `updatevm` (after it is restarted in case it is template based). If you want to have the proxy available on a `netvm` that is not deployed by Qusal, install the Qusal diff --git a/salt/dev/install-salt-tools.sls b/salt/dev/install-salt-tools.sls deleted file mode 100644 index 96a600a..0000000 --- a/salt/dev/install-salt-tools.sls +++ /dev/null @@ -1,47 +0,0 @@ -{# -SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. - -SPDX-License-Identifier: AGPL-3.0-or-later -#} - -{% if grains['nodename'] != 'dom0' -%} - -include: - - utils.tools.common.update - -"{{ slsdotpath }}-installed-salt-tools": - pkg.installed: - - require: - - sls: utils.tools.common.update - - install_recommends: False - - skip_suggestions: True - - pkgs: - - python3-pip - -{% set pkg = { - 'Debian': { - 'pkg': [], - }, - 'RedHat': { - 'pkg': ['salt-lint'], - }, -}.get(grains.os_family) -%} - -"{{ slsdotpath }}-installed-salt-tools-os-specific": - pkg.installed: - - require: - - sls: utils.tools.common.update - - install_recommends: False - - skip_suggestions: True - - pkgs: {{ pkg.pkg|sequence|yaml }} - -# Fails because of cacher -{# -{% if grains['os_family']|lower != 'redhat' -%} -pip-installed-salt-tools: - cmd.run: - - name: python3 -m pip install --break-system-packages salt-lint -{% endif -%} -#} - -{% endif %} diff --git a/salt/dev/install-salt-tools.top b/salt/dev/install-salt-tools.top deleted file mode 100644 index 5251f0e..0000000 --- a/salt/dev/install-salt-tools.top +++ /dev/null @@ -1,9 +0,0 @@ -{# -SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. - -SPDX-License-Identifier: AGPL-3.0-or-later -#} - -base: - 'tpl-dev': - - dev.install-salt-tools diff --git a/salt/dev/install.sls b/salt/dev/install.sls index 4f7a111..4dc0414 100644 --- a/salt/dev/install.sls +++ b/salt/dev/install.sls @@ -9,8 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - .home-cleanup - - .install-python-tools - - .install-salt-tools - dotfiles.copy-all - utils.tools.zsh - sys-pgp.install-client @@ -27,8 +25,6 @@ include: ## Necessary - qubes-core-agent-passwordless-root - ca-certificates - - git - - gnupg2 ## Usability - tmux - xclip @@ -49,18 +45,14 @@ include: - gitlint - pylint - yamllint - # git-send-email - - git-email - - libemail-valid-perl - - libmailtools-perl - - libauthen-sasl-perl +## Debian doesn't have: salt-lint {% set pkg = { 'Debian': { 'pkg': ['shellcheck', 'vim-nox', 'fd-find'], }, 'RedHat': { - 'pkg': ['passwd', 'fd-find', 'ShellCheck', 'vim-enhanced'], + 'pkg': ['ShellCheck', 'vim-enhanced', 'fd-find', 'salt-lint', 'passwd'], }, }.get(grains.os_family) -%}