Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2026-01-20 16:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

neovim improvements

Browse Source
This commit is contained in:
Thea Schöbl
2023-12-02 00:34:37 +01:00
parent 85f96618e1
commit aa5b236e67
3 changed files with 164 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
programs/git.nix
View File

@@ -6,4 +6,12 @@
key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
signByDefault = true;
};
extraConfig = {
pull.rebase = true;
merge = {
tool = "nvimdiff";
conflictstyle = "diff3";
};
mergetool.prompt = false;
};
}