all repos — nixfiles @ bb0c3b023be08c5a200bf063f68c4866045084b3

System and user configuration, managed by nix and home-manager

workstation: use home-manager's mergiraf option

Alan Pearce
commit

bb0c3b023be08c5a200bf063f68c4866045084b3

parent

b0b969b537a3c5b9e74eb2c21346afdf4cbd2843

1 file changed, 2 insertions(+), 46 deletions(-)

changed files
M user/settings/workstation.nixuser/settings/workstation.nix
@@ -14,7 +14,6 @@ walk
nuspell git-extras # delete-merged-branches and friends git-worktree-switcher - mergiraf gitui gitstatus hut # sourcehut tools
@@ -29,54 +28,11 @@ home.shellAliases = {
wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'"; }; + programs.mergiraf.enable = true; + programs.git = { difftastic = { enable = true; - }; - attributes = [ - # `mergiraf languages --gitattributes` - "*.java merge=mergiraf" - "*.kt merge=mergiraf" - "*.rs merge=mergiraf" - "*.go merge=mergiraf" - "*.js merge=mergiraf" - "*.jsx merge=mergiraf" - "*.mjs merge=mergiraf" - "*.json merge=mergiraf" - "*.yml merge=mergiraf" - "*.yaml merge=mergiraf" - "*.toml merge=mergiraf" - "*.html merge=mergiraf" - "*.htm merge=mergiraf" - "*.xhtml merge=mergiraf" - "*.xml merge=mergiraf" - "*.c merge=mergiraf" - "*.h merge=mergiraf" - "*.cc merge=mergiraf" - "*.cpp merge=mergiraf" - "*.hpp merge=mergiraf" - "*.cs merge=mergiraf" - "*.dart merge=mergiraf" - "*.dts merge=mergiraf" - "*.scala merge=mergiraf" - "*.sbt merge=mergiraf" - "*.ts merge=mergiraf" - "*.tsx merge=mergiraf" - "*.py merge=mergiraf" - "*.php merge=mergiraf" - "*.phtml merge=mergiraf" - "*.sol merge=mergiraf" - "*.lua merge=mergiraf" - "*.rb merge=mergiraf" - "*.nix merge=mergiraf" - "*.sv merge=mergiraf" - "*.svh merge=mergiraf" - ]; - extraConfig = { - "merge.mergiraf" = { - name = "mergiraf"; - driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"; - }; }; }; programs.gh = {