fix issues after configuration merge

This commit is contained in:
2026-08-15 22:17:56 +02:00
parent 3c53dc30b5
commit 634aa211f4
2 changed files with 8 additions and 7 deletions
+7 -6
View File
@@ -25,20 +25,21 @@ edit:
command: nvim
merge:
pager: ""
command: meld
args:
- {{ printf "%q" "{{ .Source }}" }}
- {{ printf "%q" "{{ .Destination }}" }}
- "{{`{{ .Source }}`}}"
- "{{`{{ .Destination }}`}}"
diff:
command: meld
command: sh
args:
- --diff
- {{ printf "%q" "{{ .Destination }}" }}
- {{ printf "%q" "{{ .Target }}" }}
- -c
- 'echo "Using meld"; meld --diff "{{`{{ .Destination }}`}}" "{{`{{ .Target }}`}}"'
encryption: gpg
gpg:
recipient: {{ $gpg_recipient | quote }}
# vim: ft=template syntax=yaml
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
(sleep 5 ; hyprctl eval 'request_apply_monitor_profile()') &
(sleep 2 ; hyprctl eval 'request_apply_monitor_profile()') &
hyprctl dispatch 'hl.dsp.exec_cmd("uwsm app -- thunderbird", {workspace = 10})'
{{ if eq .work_env true -}}