From e2817782ae5d11e722944268c5a56b2ce4d56df2 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Thu, 27 Jun 2024 15:56:21 +0100
Subject: [PATCH] Tidy up zshrc

---
 .zshrc | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/.zshrc b/.zshrc
index bcec9dc..1a6da0e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,26 +1,6 @@
 export SUDO_PROMPT="$(tput bold setaf 7)[sudo]$(tput sgr0) $(tput setaf 6)password for$(tput sgr0) $(tput setaf 5)%p$(tput sgr0): "
-if [[ -d "$HOME/.local/bin" ]]; then
-    export PATH="$HOME/.local/bin:$PATH"
-fi;
-
-if [[ -d "$HOME/.cargo/bin" ]]; then
-    export PATH="$HOME/.cargo/bin:$PATH"
-fi;
-
-plugins=(git sudo rsync zsh-syntax-highlighting zsh-autosuggestions)
-if [ -f $HOME/.pyenv/bin/pyenv ]; then
-  export PYENV_ROOT="$HOME/.pyenv"
-  export PATH="$PYENV_ROOT/bin:$PATH"
-  export PATH="/home/nex/.local/bin:$PATH"
-  eval "$(pyenv init -)"
-  plugins+=(pyenv)
-fi;
-
-if [ -f /usr/bin/zoxide ] || [ -f /usr/local/bin/zoxide ]; then
-  eval "$(zoxide init zsh)"
-fi;
-
 export ZSH="$HOME/.oh-my-zsh"
+plugins=(git sudo rsync zsh-syntax-highlighting zsh-autosuggestions)
 ZSH_THEME="agnoster"
 HYPHEN_INSENSITIVE="true"
 zstyle ':omz:update' mode auto      # update automatically without asking
@@ -28,9 +8,19 @@ ENABLE_CORRECTION="true"
 COMPLETION_WAITING_DOTS="true"
 HIST_STAMPS="dd.mm.yyyy"
 source $ZSH/oh-my-zsh.sh
-
 export LANG=en_GB.UTF-8
 export EDITOR=nvim
 export ARCHFLAGS="-arch x86_64"
 export GPG_TTY=$(tty)
-
+if [[ -d "$HOME/.local/bin" ]]; then
+    export PATH="$HOME/.local/bin:$PATH"
+fi;
+if [[ -d "$HOME/.cargo/bin" ]]; then
+    export PATH="$HOME/.cargo/bin:$PATH"
+fi;
+if [ -f $HOME/.pyenv/bin/pyenv ]; then
+  export PYENV_ROOT="$HOME/.pyenv"
+  export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
+  eval "$(pyenv init -)"
+  plugins+=(pyenv)
+fi;