From 036df32b2f4190ad74972706b103cd1b252cfa4e Mon Sep 17 00:00:00 2001
From: Eric Renfro <psi-jack@linux-help.org>
Date: Sun, 26 Jun 2022 09:38:46 -0400
Subject: [PATCH] Updated zsh and hexchat

---
 .profile | 1 +
 .zshenv  | 1 +
 .zshrc   | 7 -------
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.profile b/.profile
index 8b892e2..6fa0100 100644
--- a/.profile
+++ b/.profile
@@ -6,3 +6,4 @@ export EDITOR=vim
 export PATH=$PATH:$HOME/bin:$HOME/go/bin
 #export QT_QPA_PLATFORMTHEME=qgnomeplatform
 
+. "$HOME/.cargo/env"
diff --git a/.zshenv b/.zshenv
index 121400e..e767314 100644
--- a/.zshenv
+++ b/.zshenv
@@ -7,3 +7,4 @@
 : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim}
 # }}} End configuration added by Zim install
 
+. "$HOME/.cargo/env"
diff --git a/.zshrc b/.zshrc
index 47374a8..d420a76 100644
--- a/.zshrc
+++ b/.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##*/}"; }