diff --git a/private_dot_config/zsh/alias.zsh b/private_dot_config/zsh/alias.zsh
index 943e0bb..e8f6dc9 100644
--- a/private_dot_config/zsh/alias.zsh
+++ b/private_dot_config/zsh/alias.zsh
@@ -1,2 +1,5 @@
 alias ls="ls --color --group-directories-first"
 alias l="ls -l --almost-all --human-readable"
+
+alias vi="nvim"
+alias vim="nvim"
diff --git a/private_dot_config/zsh/dot_zshrc b/private_dot_config/zsh/dot_zshrc
index b33fdbd..b9749ac 100644
--- a/private_dot_config/zsh/dot_zshrc
+++ b/private_dot_config/zsh/dot_zshrc
@@ -2,8 +2,10 @@ source "$ZDOTDIR/history.zsh"
 source "$ZDOTDIR/alias.zsh"
 source "$ZDOTDIR/plugins.zsh"
 
-# Set the initial prompt
 PS1="%F{38}[%n@%m %F{45}%B%~%b%f%F{38}]%f$ "
+TIMEFMT=$'real\t%E\nuser\t%U\nsys\t%S'
+EDITOR="nvim"
+ViSUAL_EDITOR="nvim"
 
 # Bind Ctrl-left/right arrow to move back/formward one word
 # https://unix.stackexchange.com/a/140499
@@ -26,5 +28,6 @@ zstyle ":completion:*" matcher-list "m:{a-z}={A-Za-z}"
 eval "$(dircolors)"
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 
+# Import fzf and zoxide
 eval "$(fzf --zsh)"
 eval "$(zoxide init --cmd cd zsh)"
diff --git a/private_dot_config/zsh/plugins.zsh b/private_dot_config/zsh/plugins.zsh
index 00acae3..17f3a09 100644
--- a/private_dot_config/zsh/plugins.zsh
+++ b/private_dot_config/zsh/plugins.zsh
@@ -6,15 +6,15 @@ ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
 source "${ZINIT_HOME}/zinit.zsh"
 
 # Syntax highlighting
-zinit ice depth=1; zinit light "zsh-users/zsh-syntax-highlighting"
+zinit ice wait lucid depth=1; zinit light "zsh-users/zsh-syntax-highlighting"
 
 # Command completions
-zinit ice depth=1; zinit light "zsh-users/zsh-completions"
+zinit ice wait lucid depth=1; zinit light "zsh-users/zsh-completions"
 
 # History autosuggestions
-zinit ice depth=1; zinit light "zsh-users/zsh-autosuggestions"
+zinit ice wait lucid depth=1; zinit light "zsh-users/zsh-autosuggestions"
 
 # Use fzf for completion
-zinit ice depth=1; zinit light "Aloxaf/fzf-tab"
+zinit ice wait lucid depth=1; zinit light "Aloxaf/fzf-tab"
 zstyle ":fzf-tab:complete:cd:*" fzf-preview "ls --color $realpath"
 zstyle ":completion:*" menu no