From 7de27509734330495fc54235283047c2e74ee8b3 Mon Sep 17 00:00:00 2001
From: Guangxiong Lin <hi@gxlin.org>
Date: Wed, 15 Nov 2023 22:55:09 +0800
Subject: Refactor

---
 .zshrc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.zshrc')

diff --git a/.zshrc b/.zshrc
index 49de68e..c6182f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,3 @@
-setopt histignorealldups sharehistory hist_ignore_space
-
 # Use emacs keybindings even if our EDITOR is set to vi
 bindkey -e
 
@@ -21,6 +19,9 @@ source $HOME/.env
 source $HOME/.aliases
 source $HOME/.functions
 
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
 source "$HOME/.zinitrc"
 
 [ -r $HOME/.nnnrc ] && source $HOME/.nnnrc
@@ -28,12 +29,14 @@ source "$HOME/.zinitrc"
 
 command -v zoxide > /dev/null && eval "$(zoxide init --cmd j zsh)"
 
-if command -v direnv &> /dev/null; then
+if command -v direnv > /dev/null; then
     eval "$(direnv hook zsh)"
 fi
 
-if command -v navi &> /dev/null; then
+if command -v navi > /dev/null; then
     eval "$(navi widget zsh)"
 fi
 
+autoload -Uz compinit; compinit
+setopt histignorealldups sharehistory hist_ignore_space
 [ -r $HOME/.zsh_local ] && source $HOME/.zsh_local
-- 
cgit v1.2.3