diff --git a/config/aliases.zsh b/config/aliases.zsh
index 30cf6f7..6a3ad5b 100644
--- a/config/aliases.zsh
+++ b/config/aliases.zsh
@@ -6,9 +6,21 @@ alias ll='ls -lh'
 alias la='ls -lAh'
 # alias vim=nvim
 # alias vi=nvim
-# alias lg=lazygit
+if command -v nvim >/dev/null 2>&1; then
+  alias vim='nvim'
+  alias vi='nvim'
+fi
+alias lg=lazygit
 # alias rr=ranger
 
+# kitty ssh
+ssh() {
+  if [ "${TERM:-}" = "xterm-kitty" ] && command -v kitten >/dev/null 2>&1; then
+    kitten ssh "$@"
+  else
+    command ssh "$@"
+  fi
+}
 
 # git alias
 alias gco='git checkout'
@@ -20,6 +32,4 @@ alias gss='git --no-pager status -s'
 alias gpt='git push origin --tags'
 alias glt='git tag -n --sort=taggerdate | tail -n ${1-10}'
 
-# alias waybar="bash ~/.script/waybar-restart.sh &"
-
-alias rp=randport
\ No newline at end of file
+alias rp=randport
diff --git a/config/hook.zsh b/config/hook.zsh
index c402a82..b2f1b09 100644
--- a/config/hook.zsh
+++ b/config/hook.zsh
@@ -35,11 +35,3 @@ _apply_chpwd_hook() {
     [ -d "$currentdir" ] && cd $currentdir
 }
 
-# kitty ssh
-ssh() {
-  if [ "${TERM:-}" = "xterm-kitty" ] && command -v kitten >/dev/null 2>&1; then
-    kitten ssh "$@"
-  else
-    command ssh "$@"
-  fi
-}