From e7cd64615e114272b86c0d8cfd0bcff99c13b1ab Mon Sep 17 00:00:00 2001 From: surtur Date: Sun, 3 Jul 2022 11:58:53 +0200 Subject: [PATCH] zshrc: conditionally load asdf.sh --- .zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 2697b5b..99510d9 100644 --- a/.zshrc +++ b/.zshrc @@ -2,6 +2,7 @@ ZSH=$HOME/.oh-my-zsh ZSH_CACHE_DIR="$ZSH/cache" + [ -z "$IN_NIX_SHELL" ] && . $HOME/.asdf/asdf.sh # necessary to include "/usr/share/zsh/"$(zsh --version| cut -d ' ' -f2)/functions" # due to a breakage on fedora zsh version 5.8.1 (zsh.x86_64 5.8.1-1.fc35 @updates) fpath=( @@ -70,7 +71,7 @@ # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder - plugins=(asdf git gitignore golang safe-paste systemd terraform lol) + plugins=(git gitignore golang safe-paste systemd terraform lol) source $ZSH/oh-my-zsh.sh ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)