summary refs log tree commit diff stats
path: root/user/settings/git.nix
blob: 503b9e3fe22790ac665290871b6e136d5edcb218 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
{ config, pkgs, ... }:

{
  home.packages = with pkgs; [
    gitAndTools.git-extras
  ];
  programs.git = {
    enable = true;
    userName = "Alan Pearce";
    userEmail = "alan@alanpearce.eu";
    extraConfig = {
      pull = {
        rebase = true;
      };
      push = {
        default = "current";
        followTags = true;
      };
      rebase = {
        autosquash = true;
      };
      rerere = {
        enable = true;
      };
      diff = {
        algorithm = "patience";
        tool = "icdiff";
      };
      difftool = {
        prompt = false;
      };
      "difftool.icdiff" = {
        cmd = "${pkgs.icdiff}/bin/icdiff --line-numbers $LOCAL $REMOTE";
      };
      "difftool.sopsdiffer" = {
        textconf = "${pkgs.sops}/bin/sops -d";
      };
      "merge.npm-merge-driver" = {
        name = "automatically merge npm lockfiles";
        driver = "npx npm-merge-driver merge %A %O %B %P";
      };
      remote = {
        autoSetupMerge = true;
      };
      "branch.master" = {
        rebase = false;
      };
    };
    signing = {
      key = "0xCD4BEB92A8D46583";
    };
    lfs = {
      enable = true;
    };
    aliases = {
      authors = "shortlog -s -n";
      mup = "merge FETCH_HEAD";
      rup = "rebase FETCH_HEAD";
      st = "status -sb";
      ci = "commit";
      br = "branch";
      co = "checkout";
      lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'";
      pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'";
      lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'";
      prl = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'  --grep='#'";
      ignored = "ls-files --others -i --exclude-standard";
    };
    ignores = [
      ".DS_Store"
      "*_flymake.*"
      "*~"
      "\#*\#"
      ".\#*"
    ];
  };
}