Update vim init to lua

config/gitconfig

@@ -7,7 +7,7 @@
 [merge]
 	tool = nvimdiff
 [mergetool "nvimdiff"]
-  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+  cmd = nvim -d $LOCAL $MERGED $BASE  $REMOTE -c 'wincmd w' -c 'wincmd J'
 [diff]
 	tool = nvimdiff
 [difftool]
@@ -30,3 +30,5 @@
 	default = matching
 [init]
 	templatedir = ~/.git_template
+[credential]
+	helper = store

config/tmux.conf

@@ -14,6 +14,8 @@ set -g display-time 1500
 
 #set-option -g default-shell /bin/zsh
 
+set -g allow-rename off
+
 #######################################
 # key bindings
 #######################################
@@ -34,6 +36,10 @@ bind-key -n M-J switch-client -n
 bind-key -n M-L next-window
 bind-key -n M-H previous-window
 
+bind '"' split-window -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"
+bind c new-window -a -c "#{pane_current_path}"
+
 #######################################
 # status line
 #######################################