From 5b28f031b5707dd6d3d584eed39e7520d1bd9e05 Mon Sep 17 00:00:00 2001
From: nex <git@nexy7574.co.uk>
Date: Sun, 16 Jun 2024 13:23:28 +0100
Subject: [PATCH 1/5] Dynamically load cargo

---
 .bash_profile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.bash_profile b/.bash_profile
index f015706..b1e6a14 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -6,4 +6,6 @@ if [ -f ~/.bashrc ]; then
 fi
 
 # User specific environment and startup programs
-. "$HOME/.cargo/env"
+if [ -f $HOME/.cargo/env ]; then
+    . "$HOME/.cargo/env"
+fi

From 1e7e4e09d32788a65987c62b7712a3e231ce69c2 Mon Sep 17 00:00:00 2001
From: nex <git@nexy7574.co.uk>
Date: Sun, 16 Jun 2024 13:23:55 +0100
Subject: [PATCH 2/5] Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f3b6411..e2a2c23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 **/.git
+.ssh/id
+.ssh/id*

From f886f52e9658b867114be0abcddfd046a5ed1350 Mon Sep 17 00:00:00 2001
From: nex <git@nexy7574.co.uk>
Date: Sun, 16 Jun 2024 13:24:24 +0100
Subject: [PATCH 3/5] Remove submodules

---
 .gitmodules | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 24459ff..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule ".oh-my-zsh/custom/plugins/zsh-autosuggestions"]
-	path = .oh-my-zsh/custom/plugins/zsh-autosuggestions
-	url = https://github.com/zsh-users/zsh-autosuggestions
-[submodule ".oh-my-zsh/custom/plugins/zsh-syntax-highlighting"]
-	path = .oh-my-zsh/custom/plugins/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting

From be3620709888ac246dacb6665cc9f8e36a064fa5 Mon Sep 17 00:00:00 2001
From: nex <git@nexy7574.co.uk>
Date: Sun, 16 Jun 2024 13:25:17 +0100
Subject: [PATCH 4/5] Fix path in zprofile

---
 .zprofile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.zprofile b/.zprofile
index 24d160b..c0a1795 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,3 +1,2 @@
-
 # Created by `pipx` on 2024-03-20 01:03:28
-export PATH="$PATH:/home/nexus/.local/bin"
+export PATH="$PATH:$HOME/.local/bin"

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 5/5] 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;