gaschz/dotfiles
1
0
Fork 0
mirror of https://github.com/gaschz/dotfiles.git synced 2025-03-01 14:22:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: skip edit of files owned by system packages

Browse Source 
Fix: https://github.com/ben-grande/qusal/issues/101
This commit is contained in:
Ben Grande 2024-10-14 17:03:57 +02:00
parent f9457092ea
commit 7659897283
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
copy-pgp.sls
View File

@ -15,6 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- user: {{ gui_user.gui_user }} - user: {{ gui_user.gui_user }}
- group: {{ gui_user.gui_user }} - group: {{ gui_user.gui_user }}
{% if not salt['file.file_exists']('/usr/share/whonix/marker') -%}
"{{ slsdotpath }}-copy-pgp-skel": "{{ slsdotpath }}-copy-pgp-skel":
file.recurse: file.recurse:
- name: /etc/skel/ - name: /etc/skel/
@ -23,3 +25,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- dir_mode: '0700' - dir_mode: '0700'
- user: root - user: root
- group: root - group: root
{% endif -%}

4
files/git/.config/git/config
View File

@ -137,8 +137,10 @@
tool = vimdiff tool = vimdiff
conflictStyle = diff3 conflictStyle = diff3
summary = true summary = true
[protocol "qrexec"]
allow = always
[pull] [pull]
; Rebase does not verify signatures. Does not prevent manual rebase. ; Rebase does not verify signatures. Opt does not prevent manual rebase.
rebase = false rebase = false
[push] [push]
autoSetupRemote = true autoSetupRemote = true