From 0e72ff8716d7acc6f0e114fc357aad5d5f22fc1c Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Fri, 14 Feb 2025 15:19:18 +0100
Subject: [PATCH] feat: allow absent dotfiles

Some files had a small impact such as Xft.dpi definition, thus removed.
Files with bigger impact were moved to root directories such as /etc or
were specified with full path such as ~/.local/bin.

In case the dotfiles configuration does extra things, such as verifying
merge commits, it was changed to code or comment when appropriate.

For: https://github.com/ben-grande/dotfiles/pull/1
---
 salt/electrum/configure-common.sls                | 11 +----------
 salt/electrum/files/client/xprofile.d/electrum.sh | 12 ------------
 salt/mirage-builder/configure.sls                 |  9 ---------
 salt/mirage-builder/install.sls                   | 11 ++++++++++-
 salt/qubes-builder/README.md                      |  2 +-
 salt/sys-electrs/configure-builder-source.sls     |  2 +-
 6 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100755 salt/electrum/files/client/xprofile.d/electrum.sh

diff --git a/salt/electrum/configure-common.sls b/salt/electrum/configure-common.sls
index 042d07a..d690d7d 100644
--- a/salt/electrum/configure-common.sls
+++ b/salt/electrum/configure-common.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -36,13 +36,4 @@ include:
     - name: electrum --offline setconfig show_notes_tab true
     - runas: user
 
-"{{ slsdotpath }}-xprofile-to-increase-dpi":
-  file.managed:
-    - name: /home/user/.config/x11/xprofile.d/electrum.sh
-    - source: salt://{{ slsdotpath }}/files/client/xprofile.d/electrum.sh
-    - mode: '0755'
-    - user: user
-    - group: user
-    - makedirs: True
-
 {% endif -%}
diff --git a/salt/electrum/files/client/xprofile.d/electrum.sh b/salt/electrum/files/client/xprofile.d/electrum.sh
deleted file mode 100755
index e8c8771..0000000
--- a/salt/electrum/files/client/xprofile.d/electrum.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-## SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-##
-## SPDX-License-Identifier: AGPL-3.0-or-later
-
-current_dpi="$(xrdb -get Xft.dpi)"
-wanted_dpi="144"
-
-if test -z "${current_dpi}" || test "${current_dpi}" -lt "${wanted_dpi}"
-then
-  printf '%s\n' "Xft.dpi: ${wanted_dpi}" | xrdb -override -
-fi
diff --git a/salt/mirage-builder/configure.sls b/salt/mirage-builder/configure.sls
index 00943f1..6f030ce 100644
--- a/salt/mirage-builder/configure.sls
+++ b/salt/mirage-builder/configure.sls
@@ -14,15 +14,6 @@ include:
   - dotfiles.copy-ssh
   - dotfiles.copy-git
 
-"{{ slsdotpath }}-opam-completion-and-hooks":
-  file.managed:
-    - name: /home/user/.config/sh/profile.d/opam.sh
-    - source: salt://{{ slsdotpath }}/files/client/profile/opam.sh
-    - mode: '0755'
-    - user: user
-    - group: user
-    - makedirs: True
-
 "{{ slsdotpath }}-makedir-src":
   file.directory:
     - name: /home/user/src
diff --git a/salt/mirage-builder/install.sls b/salt/mirage-builder/install.sls
index 70c99d8..7b1846e 100644
--- a/salt/mirage-builder/install.sls
+++ b/salt/mirage-builder/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -42,4 +42,13 @@ include:
       - opam
       - ocaml
 
+"{{ slsdotpath }}-opam-completion-and-hooks":
+  file.managed:
+    - name: /etc/profile.d/opam.sh
+    - source: salt://{{ slsdotpath }}/files/client/profile/opam.sh
+    - mode: '0755'
+    - user: root
+    - group: root
+    - makedirs: True
+
 {% endif -%}
diff --git a/salt/qubes-builder/README.md b/salt/qubes-builder/README.md
index 27cfdb4..6348f53 100644
--- a/salt/qubes-builder/README.md
+++ b/salt/qubes-builder/README.md
@@ -87,7 +87,7 @@ Pull `qubes-builderv2` commits:
 
 ```sh
 cd ~/src/qubes-builderv2
-git pull
+git pull --verify-signatures
 ```
 
 Initialize and merge submodules:
diff --git a/salt/sys-electrs/configure-builder-source.sls b/salt/sys-electrs/configure-builder-source.sls
index 1ecffbe..cce69eb 100644
--- a/salt/sys-electrs/configure-builder-source.sls
+++ b/salt/sys-electrs/configure-builder-source.sls
@@ -122,7 +122,7 @@ include:
   cmd.run:
     - require:
       - cmd: "{{ slsdotpath }}-source-install-cfg_me"
-    - name: cfg_me -o /tmp/electrs.1 man
+    - name: /home/user/.local/bin/cfg_me -o /tmp/electrs.1 man
     - cwd: /home/user/src/electrs
     - runas: user