yorick
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git zdiff3

auto-flake-update
Yorick van Pelt 2022-04-19 07:49:05 +02:00
parent 5cd83c0f07
commit 0cc16d6689
Signed by: yorick
GPG Key ID: A36E70F9DC014A15
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home-manager/home.nix
View File

@ -38,6 +38,7 @@ in {
userEmail = "yorick@yorickvanpelt.nl";
signing.key = "A36E70F9DC014A15";
signing.signByDefault = true;
extraConfig.merge.conflictStyle = "zdiff3";
extraConfig.help.autocorrect = 5;
extraConfig.push.default = "simple";
extraConfig.pull.ff = "only";
@ -166,6 +167,7 @@ in {
watchman
## misc
moreutils
atop
awscli
borgbackup