lib/env.zsh

@@ -16,34 +16,53 @@ export LS_COLORS="ow=1;34:tw=1;34:st=00;"
 # add completions to fpath
 fpath=($DOTFILES_DIR/lib/completions $fpath)
 
-autoload -Uz compinit && compinit
-
 # Append to the history file, rather than overwriting it
 setopt APPEND_HISTORY
 
 # Disable autocd
 unsetopt autocd
 
-is-executable nvim && export EDITOR=nvim || export EDITOR=vim
+# Vim Settings
+# export VIMINIT='source $MYVIMRC'
+# export MYVIMRC='$DOTFILES_DIR/lib/.vimrc'
 
-is-executable lf && source "$XDG_CONFIG_HOME/lf/lfcd.sh"
+if is-executable nvim; then
+	export EDITOR=nvim
+else
+	export EDITOR=vim
+fi
 
+# spelling correction
+# setopt CORRECT
+# setopt CORRECT_ALL
+
+# Add lfcd command
+# ----------------
+if is-executable lf; then
+	source "$XDG_CONFIG_HOME/lf/lfcd.sh"
+fi
+# ----------------
+#
 if is-executable fnm && ! is-tty; then
 	eval "$(fnm env --shell zsh)"
 fi
-
+#
-is-executable bat && \
+if is-executable bat; then
-	export BAT_THEME=Catppuccin; \
+	export BAT_THEME=Catppuccin
 	export BAT_STYLE=header,numbers,grid
+fi
 
-
+if is-executable zoxide; then
-is-executable zoxide && \
 	export _ZO_FZF_OPTS="--preview 'command lsd --tree --color always --icon always {2..}'"
+fi
 
-is-tty && \
+export ENHANCD_DOT_ARG="up"
-	export STARSHIP_CONFIG=~/.config/starship/plain.toml \
+
-	|| \
+if is-tty; then
+	export STARSHIP_CONFIG=~/.config/starship/plain.toml
+else
 	export STARSHIP_CONFIG=~/.config/starship/config.toml
+fi
 
 export EGET_BIN=$HOME/bin
 
@@ -55,7 +74,9 @@ export ZSH_DOTENV_DISALLOWED_LIST=$HOME/.cache/dotenv-disallowed.list
 export MAMBA_NO_BANNER=1
 
 # shiv
-is-executable shiv && export SHIV_ROOT=$HOME/.local/share/shiv
+if is-executable shiv; then
+	export SHIV_ROOT=$HOME/.local/share/shiv
+fi
 
 # pyenv
 if [ -d "$HOME/.pyenv" ]; then
@@ -67,17 +88,21 @@ if [ -d "$HOME/.pyenv" ]; then
 fi
 
 # pnpm
-is-executable pnpm && \
+export PNPM_HOME="$HOME/.local/share/pnpm"
-	export PNPM_HOME="$HOME/.local/share/pnpm"; \
+# export PATH="$PNPM_HOME:$PATH"
 add-to-path prepend "$PNPM_HOME"
 
-[ -d "$HOME/.pkgs/google-cloud-sdk" ] && \
+if [ -d "$HOME/.pkgs/google-cloud-sdk" ]; then
-	source "$HOME/.pkgs/google-cloud-sdk/completion.zsh.inc"; \
+	source "$HOME/.pkgs/google-cloud-sdk/completion.zsh.inc"
+	# source "$HOME/.pkgs/google-cloud-sdk/path.zsh.inc"
 	add-to-path prepend "$HOME/.pkgs/google-cloud-sdk/bin"
+fi
 
-[ -d "$HOME/.deno" ] && \
+if [ -d "$HOME/.deno" ]; then
-	export DENO_INSTALL="$HOME/.deno"; \
+	export DENO_INSTALL="$HOME/.deno"
+	# export PATH="$DENO_INSTALL/bin:$PATH"
 	add-to-path prepend "$DENO_INSTALL/bin"
+fi
 
 if [ -d "$HOME/.bun" ]; then
 	# bun completions
@@ -85,7 +110,11 @@ if [ -d "$HOME/.bun" ]; then
 
 	# bun
 	export BUN_INSTALL="$HOME/.bun"
+	# export PATH="$BUN_INSTALL/bin:$PATH"
 	add-to-path prepend "$BUN_INSTALL/bin"
 fi
 
-[ -d "$HOME/.nimble" ] && add-to-path prepend "$HOME/.nimble/bin"
+if [ -d "$HOME/.nimble" ]; then
+	# export PATH=/home/daylin/.nimble/bin:$PATH
+	add-to-path prepend "$HOME/.nimble/bin"
+fi

lib/prompt.zsh

@@ -1,5 +1,8 @@
 #!/usr/bin/env zsh
 
+autoload -Uz compinit
+compinit
+
 is-executable zoxide && eval eval "$(zoxide init zsh --cmd cd)"
 
 if is-executable starship; then