diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/profiles/base/default.nix | 1 | ||||
| -rw-r--r-- | home/profiles/development/default.nix | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 7e67dc6..f2f7883 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -192,6 +192,7 @@ in zshell.aliases = { e = "nvim"; + nvimdiff = "nvim -d"; }; zoxide = { diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index af06caf..c823532 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -37,6 +37,9 @@ in extraConfig = { init.defaultBranch = "main"; pull.rebase = true; + + merge.tool = "nvimdiff"; + mergetool.prompt = false; }; ignores = [ |