diff options
| -rw-r--r-- | .zshenv | 36 |
1 files changed, 19 insertions, 17 deletions
@@ -4,31 +4,33 @@ export XDG_CACHE_HOME=$HOME/.cache export XDG_DATA_HOME=$HOME/.local/share export XDG_STATE_HOME=$HOME/.local/state -eval $(keychain --eval --quiet id_ed25519) +typeset -U path -PATH="$HOME/.local/bin:$PATH" -if [ -d $HOME/.local/nvim ]; then - PATH="$HOME/.local/nvim/bin:$PATH" -fi +[[ -d $HOME/.local/bin ]] && path=($HOME/.local/bin $path) +[[ -d $HOME/.local/nvim/bin ]] && path=($HOME/.local/nvim/bin $path) +[[ -d $HOME/.local/texlive/bin/x86_64-linux ]] && path=($HOME/.local/texlive/bin/x86_64-linux $path) + +export PATH # TexLive paths if [ -d $HOME/.local/texlive ]; then - PATH="$HOME/.local/texlive/bin/x86_64-linux:$PATH" - INFOPATH="$HOME/.local/texlive/texmf-dist/doc/info:$INFOPATH" - INFODIR="$HOME/.local/texlive/texmf-dist/doc/info:$INFODIR" - MANPATH="$HOME/.local/texlive/texmf-dist/doc/man:$MANPATH" + export INFOPATH="$HOME/.local/texlive/texmf-dist/doc/info:${INFOPATH:-}" + export INFODIR="$HOME/.local/texlive/texmf-dist/doc/info:${INFODIR:-}" + export MANPATH="$HOME/.local/texlive/texmf-dist/doc/man:${MANPATH:-}" fi -export PATH=$HOME/.local/bin:$PATH - -if [ -d $HOME/.local/nvim ]; then - export EDITOR=$HOME/.local/nvim/bin/nvim - export VISUAL=$HOME/.local/nvim/bin/nvim +# When neovim is installed +if EDITOR=$(command -v nvim 2>/dev/null); then + export VISUAL=$EDITOR + export MANPAGER="$EDITOR +Man!" +elif EDITOR=$(command -v vim 2>/dev/null); then + export VISUAL=$EDITOR + export MANPAGER="$EDITOR +Man!" else - export EDITOR=nvim - export VISUAL=nvim + export EDITOR=vi + export VISUAL=vi fi -export MANPAGER='nvim +Man!' + export PAGER="less" export BROWSER=/usr/bin/firefox export QT_QPA_PLATFORMTHEME=qt5ct |