Updated zsh and hexchat

.profile

@@ -6,3 +6,4 @@ export EDITOR=vim
 export PATH=$PATH:$HOME/bin:$HOME/go/bin
 #export QT_QPA_PLATFORMTHEME=qgnomeplatform
 
+. "$HOME/.cargo/env"

.zshenv

@@ -7,3 +7,4 @@
 : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim}
 # }}} End configuration added by Zim install
 
+. "$HOME/.cargo/env"

.zshrc

@@ -122,21 +122,14 @@ bindkey -M vicmd 'k' history-substring-search-up
 bindkey -M vicmd 'j' history-substring-search-down
 # }}} End configuration added by Zim install
 
-<<<<<<< HEAD
-=======
 # Homebrew
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
 # Set Path:
 typeset -U PATH
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 export PATH
 
-<<<<<<< HEAD
-
-=======
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 # Portable alternative to readlink -f
 zpath() { cd -P . || return
   _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; }