diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/home-minimal.nix | 25 | ||||
| -rw-r--r-- | home/packages-minimal.nix | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix index 42f358d..78d6014 100644 --- a/home/home-minimal.nix +++ b/home/home-minimal.nix @@ -138,8 +138,33 @@ commit.verbose = true; rerere.enabled = true; branch.sort = "-authordate"; + + merge.mergiraf = { + name = "mergiraf"; + driver = "merigraf merge --git %O %A %B -s %S -x %X -y %Y -p %P"; + }; }; + attributes = [ + "*.java merge=mergiraf" + "*.rs merge=mergiraf" + "*.go merge=mergiraf" + "*.js merge=mergiraf" + "*.jsx merge=mergiraf" + "*.json merge=mergiraf" + "*.yml merge=mergiraf" + "*.yaml merge=mergiraf" + "*.html merge=mergiraf" + "*.htm merge=mergiraf" + "*.xhtml merge=mergiraf" + "*.xml merge=mergiraf" + "*.c merge=mergiraf" + "*.h merge=mergiraf" + "*.cpp merge=mergiraf" + "*.hpp merge=mergiraf" + "*.cs merge=mergiraf" + ]; + # diff-so-fancy.enable = true; # difftastic.enable = true; delta = { diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix index fe09bc3..f2294ec 100644 --- a/home/packages-minimal.nix +++ b/home/packages-minimal.nix @@ -21,7 +21,7 @@ # nix tools nixpkgs-review nix-top nix-diff nix-tree # git - gitAndTools.gitAnnex git-bug git-appraise + gitAndTools.gitAnnex git-bug git-appraise mergiraf # other things gauche # html, js & co |