chore: this borders on code golf

lib/env.zsh

@@ -16,53 +16,34 @@ 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
 
-# Vim Settings
+is-executable nvim && export EDITOR=nvim || export EDITOR=vim
-# export VIMINIT='source $MYVIMRC'
-# export MYVIMRC='$DOTFILES_DIR/lib/.vimrc'
 
-if is-executable nvim; then
+is-executable lf && source "$XDG_CONFIG_HOME/lf/lfcd.sh"
-	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
-#
+
-if is-executable bat; then
+is-executable bat && \
-	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
 
-export ENHANCD_DOT_ARG="up"
+is-tty && \
-
+	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
 
@@ -74,9 +55,7 @@ export ZSH_DOTENV_DISALLOWED_LIST=$HOME/.cache/dotenv-disallowed.list
 export MAMBA_NO_BANNER=1
 
 # shiv
-if is-executable shiv; then
+is-executable shiv && export SHIV_ROOT=$HOME/.local/share/shiv
-	export SHIV_ROOT=$HOME/.local/share/shiv
-fi
 
 # pyenv
 if [ -d "$HOME/.pyenv" ]; then
@@ -88,21 +67,17 @@ if [ -d "$HOME/.pyenv" ]; then
 fi
 
 # pnpm
-export PNPM_HOME="$HOME/.local/share/pnpm"
+is-executable pnpm && \
-# export PATH="$PNPM_HOME:$PATH"
+	export PNPM_HOME="$HOME/.local/share/pnpm"; \
 	add-to-path prepend "$PNPM_HOME"
 
-if [ -d "$HOME/.pkgs/google-cloud-sdk" ]; then
+[ -d "$HOME/.pkgs/google-cloud-sdk" ] && \
-	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
 
-if [ -d "$HOME/.deno" ]; then
+[ -d "$HOME/.deno" ] && \
-	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
@@ -110,11 +85,7 @@ 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
 
-if [ -d "$HOME/.nimble" ]; then
+[ -d "$HOME/.nimble" ] && add-to-path prepend "$HOME/.nimble/bin"
-	# export PATH=/home/daylin/.nimble/bin:$PATH
-	add-to-path prepend "$HOME/.nimble/bin"
-fi

lib/prompt.zsh

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