diff options
| author | Adrian Kummerlaender | 2019-04-27 21:22:44 +0200 |
|---|---|---|
| committer | Adrian Kummerlaender | 2019-04-27 21:22:44 +0200 |
| commit | 5b0649f18ad2b63614f527a9002c1db621afd370 (patch) | |
| tree | 9b49ac719284fa0202ae7049992ac16c33494d14 | |
| parent | 9ecd5f01f88f2d550e23156f7143154cd248c699 (diff) | |
| download | nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.gz nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.bz2 nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.lz nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.xz nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.zst nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.zip | |
Set meld as git merge tool
| -rw-r--r-- | gui/apps/dev.nix | 4 | ||||
| -rw-r--r-- | home.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix index 4f3bf2e..9b2c044 100644 --- a/gui/apps/dev.nix +++ b/gui/apps/dev.nix @@ -7,8 +7,10 @@ zeal hotspot qcachegrind - gitg paraview + # version control + gitg + meld # language utilities artha ]; @@ -23,7 +23,9 @@ userName = "Adrian Kummerlaender"; userEmail = "adrian@kummerlaender.eu"; + extraConfig.core.editor = "vim"; + extraConfig.merge.tool = "${pkgs.meld}/bin/meld"; }; programs.ssh = { |