diff --git a/fish/config.fish b/fish/config.fish
index 5ef6095..1362b1c 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -19,12 +19,12 @@ set -gx EDITOR vim
 
 # alias 
 # git
-abbr -a gitb "git branch --show-current | tr -d '\n' | pbcopy"
-abbr -a gci "golangci-lint run -c=~/.dotfile/.golangci.yml ./..."
-abbr -a gmt "go mod tidy"
-abbr -a gtc "go test -gcflags=all=-l -cover ./..."
-abbr -a swg "swag init -o docs -g "
-abbr -a sws "swagger serve -F=swagger"
+alias gitb="git branch --show-current | tr -d '\n' | pbcopy"
+alias gci="golangci-lint run -c=~/.dotfile/.golangci.yml ./..."
+alias gmt="go mod tidy"
+alias gtc="go test -gcflags=all=-l -cover ./..."
+alias swg="swag init -o docs -g "
+alias sws="swagger serve -F=swagger"
 
 function gtr
   go test -gcflags=all=-l -v -run="$1"
diff --git a/git/.gitconfig b/git/.gitconfig
index d371c13..fb93374 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,51 +1,66 @@
 [user]
-    name = Laily
-    email = i@laily.net
+  name = Laily
+  email = i@laily.net
 [core]
-    autocrlf = input
-    quotepath = false
-    editor = /usr/local/bin/nvim
-    excludesfile = ~/.dotfile/git/.gitignore
+  autocrlf = input
+  quotepath = false
+  editor = nvim
+  excludesfile = ~/.dotfile/git/.gitignore
 [push]
-    default = current
+  default = current
 [pull]
-    rebase = false
+  rebase = false
+[color]
+  status = auto
+  diff = auto
+  branch = auto
+  interactive = auto
+  grep = auto
+  ui = auto
 [merge]
-    tool = vimdiff
+  tool = nvimdiff
+[difftool "nvimdiff"]
+  cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
+[mergetool "nvimdiff"]
+  cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+  trustExitCode = true
 [includeIf "gitdir:~/workrepo/"]
-    path = ~/.workgitconfig
+  path = ~/.workgitconfig
 [branch]
-    autoSetupMerge = always
+  autoSetupMerge = always
 [alias]
-    au = add -u
-    co = checkout
-    cm = "!f() { if [[ -z \"$1\" ]]; then git commit; else git commit -m \"$*\"; fi; }; f"
-    st = status
-    ap = add -p
-    br = branch
-    pl = pull
-    pt = push origin --tags
-    merge2 = !sh -c '_CURRENT_BRANCH=$(git symbolic-ref --short HEAD) && git checkout $1 && git merge $_CURRENT_BRANCH && git checkout $_CURRENT_BRANCH' -
-    bg = "!f() { git branch | grep $1; }; f"
-    delbr = "!f(){ git branch -D $(git branch | grep \"\b$1\"); };f"
-    can = commit --amend --no-edit
-    cleanbr = "!git branch --merged master | grep  -v '\\*\\|master\\|main' | xargs -n 1 git branch -d"
-    # list files which have changed since REVIEW_BASE
-    # (REVIEW_BASE defaults to 'master' in my zshrc)
-    files = !git diff --name-only $(git merge-base HEAD \"$REVIEW_BASE\")
+  au = add -u
+  co = checkout
+  cm = "!f() { if [[ -z \"$1\" ]]; then git commit; else git commit -m \"$*\"; fi; }; f"
+  st = status
+  ap = add -p
+  br = branch
+  ba = branch -a
+  bm = branch --merged
+  bn = branch --no-merged
+  pl = pull
+  pt = push origin --tags
+  merge2 = !sh -c '_CURRENT_BRANCH=$(git symbolic-ref --short HEAD) && git checkout $1 && git merge $_CURRENT_BRANCH && git checkout $_CURRENT_BRANCH' -
+  bg = "!f() { git branch | grep $1; }; f"
+  delbr = "!f(){ git branch -D $(git branch | grep \"\b$1\"); };f"
+  can = commit --amend --no-edit
+  cleanbr = "!git branch --merged master | grep  -v '\\*\\|master\\|main' | xargs -n 1 git branch -d"
+  # list files which have changed since REVIEW_BASE
+  # (REVIEW_BASE defaults to 'master' in my zshrc)
+  files = !git diff --name-only $(git merge-base HEAD \"$REVIEW_BASE\")
 
-    # Same as above, but with a diff stat instead of just names
-    # (better for interactive use)
-    stat = !git diff --stat $(git merge-base HEAD \"$REVIEW_BASE\")
-    # Open all files changed since REVIEW_BASE in Vim tabs
-    # Then, run fugitive's :Gdiff in each tab, and finally
-    # tell vim-gitgutter to show +/- for changes since REVIEW_BASE
-    review = !vim -p $(git files) +\"tabdo Gdiffsplit $REVIEW_BASE\" +\"let g:gitgutter_diff_base = '$REVIEW_BASE'\"
+  # Same as above, but with a diff stat instead of just names
+  # (better for interactive use)
+  stat = !git diff --stat $(git merge-base HEAD \"$REVIEW_BASE\")
+  # Open all files changed since REVIEW_BASE in Vim tabs
+  # Then, run fugitive's :Gdiff in each tab, and finally
+  # tell vim-gitgutter to show +/- for changes since REVIEW_BASE
+  review = !vim -p $(git files) +\"tabdo Gdiffsplit $REVIEW_BASE\" +\"let g:gitgutter_diff_base = '$REVIEW_BASE'\"
 
-    # Same as the above, except specify names of files as arguments,
-    # instead of opening all files:
-    # git reviewone foo.js bar.js
-    reviewone = !vim -p +\"tabdo Gdiff $REVIEW_BASE\" +\"let g:gitgutter_diff_base = '$REVIEW_BASE'\"
-    #git filter-branch -f --env-filter "GIT_AUTHOR_NAME='Laily'; GIT_AUTHOR_EMAIL='i@laily.net'; GIT_COMMITTER_NAME='Laily'; GIT_COMMITTER_EMAIL='i@laily.net';" HEAD
+  # Same as the above, except specify names of files as arguments,
+  # instead of opening all files:
+  # git reviewone foo.js bar.js
+  reviewone = !vim -p +\"tabdo Gdiff $REVIEW_BASE\" +\"let g:gitgutter_diff_base = '$REVIEW_BASE'\"
+  #git filter-branch -f --env-filter "GIT_AUTHOR_NAME='Laily'; GIT_AUTHOR_EMAIL='i@laily.net'; GIT_COMMITTER_NAME='Laily'; GIT_COMMITTER_EMAIL='i@laily.net';" HEAD
 [protocol "file"]
-	allow = always
+  allow = always