sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: more config options for git fuzzy

Browse source
This commit is contained in:
oddlama 2023-09-18 16:11:44 +02:00
parent 80a4544bee
commit 761adc3133
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
users/myuser/git.nix
View file

@ -27,6 +27,18 @@
syntax-theme = "TwoDark";
tabs = 4;
};
fuzzy = {
bat-theme = "TwoDark";
# TODO fuzzy is bad, it hardcodes diff | pager exec style.
# This needs to be patched so we can use difft. alternative:
# don't use a pager in fuzzy and somehow make difft width available to the main git diff command
#preferred-pager = let
# wrapper = pkgs.writeShellScript "difft-for-fuzzy" ''
# ${pkgs.difftastic}/bin/difft --color=always --width "$1"
# '');
#in "${wrapper} __WIDTH__";
status-directory-preview-command = "ls -lahF --group-directories-first --show-control-chars --quoting-style=escape --color=always";
};
difftool.prompt = true;
init.defaultBranch = "main";
merge.conflictstyle = "diff3";