xevion/dotfiles
1
0
Fork 0
mirror of https://github.com/Xevion/dotfiles.git synced 2025-12-07 03:14:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use VS Code for merges

Browse Source
This commit is contained in:
Xevion
2024-10-11 14:49:12 -05:00
parent 34ccd428ce
commit b80775e484
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.chezmoi.toml.tmpl
View File

@@ -24,6 +24,13 @@
{{- $cpuThreads = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "(Get-CimInstance -ClassName 'Win32_Processor').NumberOfLogicalProcessors") | trim | atoi }} {{- $cpuThreads = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "(Get-CimInstance -ClassName 'Win32_Processor').NumberOfLogicalProcessors") | trim | atoi }}
{{- end -}} {{- end -}}
[merge]
command = "bash"
args = [
"-c",
"cp {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base && code --new-window --wait --merge {{ "{{" }} .Destination {{ "}}" }} {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base {{ "{{" }} .Source {{ "}}" }}",
]
[data] [data]
chassis = "{{ $chassisType }}" chassis = "{{ $chassisType }}"