add kak-pager and diffr
This commit is contained in:
parent
9d850b5a09
commit
97bbd4ebb0
7 changed files with 114 additions and 6 deletions
34
user/git.nix
Normal file
34
user/git.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let inherit (import ./variables.nix) username mail;
|
||||
in {
|
||||
config = {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
user = {
|
||||
name = username;
|
||||
email = mail.personal.user;
|
||||
};
|
||||
init.defaultBranch = "main";
|
||||
commit.verbose = true;
|
||||
pull.rebase = true;
|
||||
merge.conflictStyle = "diff3";
|
||||
rerere.enabled = true;
|
||||
rebase = {
|
||||
abbreviateCommands = true;
|
||||
autoSquash = true;
|
||||
autoStash = true;
|
||||
};
|
||||
pager = {
|
||||
log = "${pkgs._diffr}/bin/diffr | ${pkgs.kak-pager}/bin/kak-pager";
|
||||
show = "${pkgs._diffr}/bin/diffr | ${pkgs.kak-pager}/bin/kak-pager";
|
||||
diff = "${pkgs._diffr}/bin/diffr | ${pkgs.kak-pager}/bin/kak-pager";
|
||||
};
|
||||
alias = {
|
||||
graph = "log --graph --oneline --all";
|
||||
root = "rev-parse --show-toplevel";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue