From 7659897283297be0ee9e5e41943c05a8a925e688 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Mon, 14 Oct 2024 17:03:57 +0200
Subject: [PATCH] fix: skip edit of files owned by system packages

Fix: https://github.com/ben-grande/qusal/issues/101
---
 copy-pgp.sls                 | 4 ++++
 files/git/.config/git/config | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/copy-pgp.sls b/copy-pgp.sls
index a2e4b68..2b91f41 100644
--- a/copy-pgp.sls
+++ b/copy-pgp.sls
@@ -15,6 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     - user: {{ gui_user.gui_user }}
     - group: {{ gui_user.gui_user }}
 
+{% if not salt['file.file_exists']('/usr/share/whonix/marker') -%}
+
 "{{ slsdotpath }}-copy-pgp-skel":
   file.recurse:
     - name: /etc/skel/
@@ -23,3 +25,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     - dir_mode: '0700'
     - user: root
     - group: root
+
+{% endif -%}
diff --git a/files/git/.config/git/config b/files/git/.config/git/config
index a9d88f2..2a8284e 100644
--- a/files/git/.config/git/config
+++ b/files/git/.config/git/config
@@ -137,8 +137,10 @@
 	tool = vimdiff
 	conflictStyle = diff3
 	summary = true
+[protocol "qrexec"]
+	allow = always
 [pull]
-	; Rebase does not verify signatures. Does not prevent manual rebase.
+	; Rebase does not verify signatures. Opt does not prevent manual rebase.
 	rebase = false
 [push]
 	autoSetupRemote = true