feat: clean dev installation

- git-send-email was implemented for a future RPC service for SMTP that
  was never created and can have some risks. As dev has no networking by
  default and the service was never created, removing it;
- git and gnupg already present in the included states;
- remove commented code; and
- move separate salt state to default installation as it only contains a
  single package that is not troublesome.

salt/dev/README.md

@@ -43,6 +43,11 @@ fi
 ```
 <!-- pkg:end:post-install -->
 
+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

salt/dev/install-salt-tools.sls

@@ -1,47 +0,0 @@
-{#
-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 }}-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 %}

salt/dev/install-salt-tools.top

@@ -1,9 +0,0 @@
-{#
-SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-
-SPDX-License-Identifier: AGPL-3.0-or-later
-#}
-
-base:
-  'tpl-dev':
-    - dev.install-salt-tools

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) -%}