From 318a31846d20cc80de090adee201de14965bf545 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Fri, 26 Nov 2021 18:30:05 +0900
Subject: use neovim instead of vim

---
 .config/git/config | 14 +++++++++++++-
 .zshrc             |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index e82cf0b..e49d577 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,5 +1,5 @@
 [core]
-    editor = vim
+    editor = nvim
     commentchar = ";"
 
 [help]
@@ -15,6 +15,15 @@
     tool = vimdiff
     ff = false
 
+[mergetool "vimdiff"]
+    cmd = "__fn() { \
+        if [ -z \"$BASE\" ]; then \
+            nvim -d -c 'wincmd l' \"$LOCAL\" \"$MERGED\" \"$REMOTE\"; \
+        else \
+            nvim -d -c '4wincmd w | wincmd J | diffoff' \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\"; \
+        fi; \
+    }; __fn"
+
 [rebase]
     abbreviatecommands = true
     autosquash = true
@@ -23,6 +32,9 @@
 [diff]
     tool = vimdiff
 
+[difftool "vimdiff"]
+    cmd = "nvim -R -d -c 'wincmd l' -c 'cd $GIT_PREFIX' \"$LOCAL\" \"$REMOTE\""
+
 [init]
     defaultbranch = main
 
diff --git a/.zshrc b/.zshrc
index 6f7d610..b5564f1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -382,9 +382,13 @@ alias rm="rm -i"
 alias zmv='noglob zmv -W'
 alias fd='noglob fd'
 
-alias e='vim'
 alias g='git'
 
+alias vim='nvim'
+alias vimdiff='nvim -d'
+alias view='nvim -R'
+alias e='nvim'
+
 if [[ "$(uname)" == "Darwin" ]]; then
     alias o='open'
 else
-- 
cgit v1.2.3-70-g09d2