Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2025-12-12 03:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: language injections

Browse Source
This commit is contained in:
Thea Schöbl
2024-06-10 18:32:51 +02:00
parent 552e85b6b6
commit b801064f84
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/home-manager/programs/git.nix
View File

@@ -14,9 +14,8 @@
conflictstyle = "diff3";
};
mergetool.nvim-mergetool = {
cmd = ''
nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
'';
cmd = # sh
''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
trustExitCode = true;
};
mergetool.prompt = false;