mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

feat: use delta as git pager (for diff we still have difft)

Browse source
This commit is contained in:
oddlama 2023-09-18 12:45:18 +02:00
parent a0f5d365eb
commit 89fd5abd88
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
users/myuser/git.nix
View file

@ -1,12 +1,32 @@
{lib, ...}: { {
# TODO use git-fuzzy. lib,
# TODO integrate git-fuzzy and difft pkgs,
...
}: {
home.packages = with pkgs; [
git-filter-repo
git-fuzzy
];
programs.gitui.enable = true; programs.gitui.enable = true;
programs.git = { programs.git = {
enable = true; enable = true;
difftastic.enable = true; difftastic = {
enable = true;
background = "dark";
};
lfs.enable = lib.mkDefault false; lfs.enable = lib.mkDefault false;
extraConfig = { extraConfig = {
core.pager = "${pkgs.delta}/bin/delta";
delta = {
hyperlinks = true;
keep-plus-minus-markers = true;
line-numbers = true;
navigate = true;
side-by-side = true;
syntax-theme = "TwoDark";
tabs = 4;
};
difftool.prompt = true; difftool.prompt = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";