test

2025-04-06 14:23:56 -04:00 · 2023-10-30 17:14:06 +00:00 · 2023-10-30 17:14:06 +00:00 · 55f37133f2
commit 55f37133f2
parent ae3f6cab93
396 changed files with 517 additions and 497 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,13 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: CC0-1.0
+# vim: nospell

 qusal/qubesos-github-io
 qusal/sys-audio
+qusal/sys-gui
 qusal/sys-wireguard
 qusal/sys-syncthing
 qusal/sys-rsync
-qusal/sys-ssh
+qusal/sys-sshfs
+qusal/sys-mirage-firewall
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: CC0-1.0

--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -1,10 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qusal
-Upstream-Contact: Benjamin Grande Miranda de Sousa <ben.grande.b@gmail.com>
+Upstream-Contact: Benjamin Grande M. S. <ben.grande.b@gmail.com>
 Source: https://github.com/ben-grande/qusal

 Files: */README.md
-Copyright: 2023 Qusal contributors
+Copyright: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 License: CC-BY-SA-4.0

 Files: qusal/ansible/files/repo/*
@ -38,12 +38,4 @@ Copyright: The Qubes OS Project <https://www.qubes-os.org>
           Simon Gaiser <simon@invisiblethingslab.com>
 License: CC0-1.0

-Files: qusal/dotfiles/files/git/.config/git/message
-Copyright: 2023 Qusal contributors
-License: CC0-1.0
-
-Files: qusal/dotfiles/files/sh/.config/less/lesskey-old
-Copyright: 2023 Qusal contributors
-License: GPL-3.0-or-later
-
 # vim: ft=debcopyright
--- a/.salt-lint
+++ b/.salt-lint
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-Qusal - Salt Formulas for Qubes OS
-Copyright (C) 2023 Qusal contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
@ -79,6 +79,12 @@ The RPM Spec is not ready, don't try it unless for development.
 Qusal is now installed. Please read the README.md of each project for further
 information on how to install the desired package.

+The intended behaviour is to enforce the state of qubes and their services. If
+you modify the qubes and their services and apply the state again, there is a
+good chance your choices will be overwritten. To enforce your state,
+declaratively specify the desired state, do not do it manually, we are past
+that.
+
 Qubes global settings (qubes-prefs) that will be managed:

 - **clockvm**: disp-sys-net, sys-net
@ -113,8 +119,6 @@ a companion `.license` or in `.reuse/dep5`.

 Here is a brief summary as of October 2023:

- All original source code is licensed under GPL-3.0-or-later.
- All documentation is licensed under CC-BY-SA-4.0.
- Some configuration and data files are licensed under CC0-1.0.
- Some borrowed code (`qusal/dotfiles/`) is licenses under BSD-2-Clause,
-  CC-BY-SA-4.0, GPL-2.0-only, GPL-3.0-only, MIT, Vim.
+- Source code is licensed under GPL-3.0-or-later;
+- Documentation is licensed under CC-BY-SA-4.0; and
+- Configuration and data files are licensed under CC0-1.0.
--- a/minion.d/qusal.conf
+++ b/minion.d/qusal.conf
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: CC0-1.0

--- a/qusal/ansible/clone.sls
+++ b/qusal/ansible/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/clone.top
+++ b/qusal/ansible/clone.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/configure-minion.sls
+++ b/qusal/ansible/configure-minion.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/configure-minion.top
+++ b/qusal/ansible/configure-minion.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/configure.sls
+++ b/qusal/ansible/configure.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/configure.top
+++ b/qusal/ansible/configure.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/create.sls
+++ b/qusal/ansible/create.sls
@ -1,9 +1,11 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

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

+{%- from "qvm/template.jinja" import load -%}
+
 include:
  - .clone

--- a/qusal/ansible/create.top
+++ b/qusal/ansible/create.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/files/minion/99-sshd-ansible.conf
+++ b/qusal/ansible/files/minion/99-sshd-ansible.conf
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/ansible/files/policy/default.policy
+++ b/qusal/ansible/files/policy/default.policy
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/ansible/files/server/99-ssh-ansible.conf
+++ b/qusal/ansible/files/server/99-ssh-ansible.conf
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/ansible/init.top
+++ b/qusal/ansible/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/install.sls
+++ b/qusal/ansible/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/ansible/install.top
+++ b/qusal/ansible/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/appmenus.sls
+++ b/qusal/browser/appmenus.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/appmenus.top
+++ b/qusal/browser/appmenus.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/clone.sls
+++ b/qusal/browser/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/clone.top
+++ b/qusal/browser/clone.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/create.sls
+++ b/qusal/browser/create.sls
@ -1,9 +1,11 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

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

+{%- from "qvm/template.jinja" import load -%}
+
 include:
  - .clone

--- a/qusal/browser/create.top
+++ b/qusal/browser/create.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/init.top
+++ b/qusal/browser/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-chrome.sls
+++ b/qusal/browser/install-chrome.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-chrome.top
+++ b/qusal/browser/install-chrome.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-chromium.sls
+++ b/qusal/browser/install-chromium.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-chromium.top
+++ b/qusal/browser/install-chromium.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-common.sls
+++ b/qusal/browser/install-common.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-common.top
+++ b/qusal/browser/install-common.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-firefox.sls
+++ b/qusal/browser/install-firefox.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-firefox.top
+++ b/qusal/browser/install-firefox.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-lynx.sls
+++ b/qusal/browser/install-lynx.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-lynx.top
+++ b/qusal/browser/install-lynx.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-w3m.sls
+++ b/qusal/browser/install-w3m.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install-w3m.top
+++ b/qusal/browser/install-w3m.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install.sls
+++ b/qusal/browser/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/browser/install.top
+++ b/qusal/browser/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/clone.sls
+++ b/qusal/debian-minimal/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/clone.top
+++ b/qusal/debian-minimal/clone.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/create.sls
+++ b/qusal/debian-minimal/create.sls
@ -1,9 +1,11 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

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

+{%- from "qvm/template.jinja" import load -%}
+
 {%- import slsdotpath ~ "/template.jinja" as template -%}

 include:
--- a/qusal/debian-minimal/create.top
+++ b/qusal/debian-minimal/create.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/init.top
+++ b/qusal/debian-minimal/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/install.sls
+++ b/qusal/debian-minimal/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/install.top
+++ b/qusal/debian-minimal/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian-minimal/template.jinja
+++ b/qusal/debian-minimal/template.jinja
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/clone.sls
+++ b/qusal/debian/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/clone.top
+++ b/qusal/debian/clone.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/create.sls
+++ b/qusal/debian/create.sls
@ -1,9 +1,11 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

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

+{%- from "qvm/template.jinja" import load -%}
+
 {%- import slsdotpath ~ "/template.jinja" as template -%}

 include:
--- a/qusal/debian/create.top
+++ b/qusal/debian/create.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/init.top
+++ b/qusal/debian/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/install.sls
+++ b/qusal/debian/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/install.top
+++ b/qusal/debian/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/debian/template.jinja
+++ b/qusal/debian/template.jinja
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/clone.sls
+++ b/qusal/dev/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/clone.top
+++ b/qusal/dev/clone.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/configure.sls
+++ b/qusal/dev/configure.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/create.sls
+++ b/qusal/dev/create.sls
@ -1,14 +1,14 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

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

+{%- from "qvm/template.jinja" import load -%}
+
 include:
  - .clone

-{%- from "qvm/template.jinja" import load -%}
-
 {% load_yaml as defaults -%}
 name: {{ slsdotpath }}
 force: True
@ -20,7 +20,6 @@ present:
 prefs:
 - template: tpl-{{ slsdotpath }}
 - label: purple
- netvm: ""
 - vpus: 1
 - memory: 400
 - maxmem: 600
@ -47,7 +46,6 @@ present:
 prefs:
 - template: tpl-{{ slsdotpath }}
 - label: red
- netvm: ""
 - vpus: 1
 - memory: 400
 - maxmem: 600
--- a/qusal/dev/create.top
+++ b/qusal/dev/create.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/home-cleanup.sls
+++ b/qusal/dev/home-cleanup.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/home-cleanup.top
+++ b/qusal/dev/home-cleanup.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/init.sls
+++ b/qusal/dev/init.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/init.top
+++ b/qusal/dev/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install-python-tools.sls
+++ b/qusal/dev/install-python-tools.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install-python-tools.top
+++ b/qusal/dev/install-python-tools.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install-salt-tools.sls
+++ b/qusal/dev/install-salt-tools.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install-salt-tools.top
+++ b/qusal/dev/install-salt-tools.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install.sls
+++ b/qusal/dev/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dev/install.top
+++ b/qusal/dev/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/docker/configure.sls
+++ b/qusal/docker/configure.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/docker/configure.top
+++ b/qusal/docker/configure.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/docker/init.top
+++ b/qusal/docker/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/docker/install.sls
+++ b/qusal/docker/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/docker/install.top
+++ b/qusal/docker/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/backup.sls
+++ b/qusal/dom0/backup.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
@ -19,3 +19,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
    - mode: '0755'
    - user: root
    - group: root
+    - replace: False
--- a/qusal/dom0/backup.top
+++ b/qusal/dom0/backup.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/dotfiles.sls
+++ b/qusal/dom0/dotfiles.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/dotfiles.top
+++ b/qusal/dom0/dotfiles.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier
+++ b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier
@ -1,7 +1,7 @@
 #!/bin/sh

 # SPDX-FileCopyrightText: 2018 Oded Arbel <https://geek.co.li>
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

@ -31,9 +31,9 @@ while read -r _ _ _ _ _ path interface member; do
  test "$member" = "$signal" || continue
  id="$(qdbus "$service" "$path" "$interface.CurrentActivity")"
  name="$(qdbus "$service" "$path" "$interface.ActivityName" "$id")"
-  if command -v kdialog; then
+  if command -v kdialog >/dev/null; then
    kdialog --title "Activity: $name" --passivepopup "Switched Activities" 3
-  elif command -v notify-send; then
+  elif command -v notify-send >/dev/null; then
    notify-send -u normal -t 3000 "Activity: $name" "Switched activities"
  fi
 done
--- a/qusal/dom0/files/autostart/xprofile.desktop
+++ b/qusal/dom0/files/autostart/xprofile.desktop
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/dom0/files/backup/qusal.conf
+++ b/qusal/dom0/files/backup/qusal.conf
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/dom0/files/bin/qubes-kde-win-rules
+++ b/qusal/dom0/files/bin/qubes-kde-win-rules
@ -1,6 +1,6 @@
 #!/bin/sh

-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/dom0/files/bin/qvm-backup-find-last
+++ b/qusal/dom0/files/bin/qvm-backup-find-last
@ -1,6 +1,6 @@
 #!/bin/sh

-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

--- a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh
+++ b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh
@ -1,12 +1,14 @@
 #!/bin/sh

-# SPDX-FileCopyrightText: 2023 Qusal contributors
+# SPDX-FileCopyrightText: 2020 The Qubes OS Project <https://www.qubes-os.org>
+# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

 ## Use Qubes provided menu instead of the default one.
-case "$XDG_SESSION_DESKTOP" in
+case "${XDG_SESSION_DESKTOP-}" in
  KDE|plasma) XDG_MENU_PREFIX="kf5-";;
  *) XDG_MENU_PREFIX="qubes-";;
 esac
+
 export XDG_MENU_PREFIX
--- a/qusal/dom0/init.sls
+++ b/qusal/dom0/init.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/init.top
+++ b/qusal/dom0/init.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/install.sls
+++ b/qusal/dom0/install.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/install.top
+++ b/qusal/dom0/install.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/kde.sls
+++ b/qusal/dom0/kde.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/kde.top
+++ b/qusal/dom0/kde.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/xorg.sls
+++ b/qusal/dom0/xorg.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dom0/xorg.top
+++ b/qusal/dom0/xorg.top
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/qusal/dotfiles
+++ b/qusal/dotfiles
@ -1 +1 @@
-Subproject commit 3e87d99fdc0c5ca477ccf0952f70a1ca82c8c696
+Subproject commit edd1ac0a8a66f3aab4a348d0a9b34e290b536fcf
--- a/qusal/fedora-minimal/clone.sls
+++ b/qusal/fedora-minimal/clone.sls
@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 Qusal contributors
+SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>

 SPDX-License-Identifier: GPL-3.0-or-later
 #}
--- a/Show More
+++ b/Show More