From 42f58a5d01193ff3abbf2f16f060fe1bd4a92ee3 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 16 Jul 2022 11:34:53 +0100
Subject: [PATCH] Add sheldon config file, fix PATH setup

---
 bootstrap.sh |  1 +
 sheldon.toml | 34 ++++++++++++++++++++++++++++++++++
 zshrc.zsh    |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 sheldon.toml

diff --git a/bootstrap.sh b/bootstrap.sh
index cb8edd7..600edb4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,6 +16,7 @@ test -d $HOME/.ncmpcpp || mkdir $HOME/.ncmpcpp
 test -L $HOME/.ncmpcpp/config || ln -f -s $BASEDIR/ncmpcpp $HOME/.ncmpcpp/config
 test -L $HOME/.tmux.conf || ln -f -s $BASEDIR/tmux $HOME/.tmux.conf
 test -L $HOME/.config/starship.toml || ln -f -s $BASEDIR/starship.toml $HOME/.config/starship.toml
+test -L $HOME/.sheldon/plugins.toml || ln -f -s $BASEDIR/sheldon.toml $HOME/.sheldon/plugins.toml
 test -L $HOME/.zsh || ln -f -s $BASEDIR/zsh $HOME/.zsh
 test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc.zsh $HOME/.zshrc
 
diff --git a/sheldon.toml b/sheldon.toml
new file mode 100644
index 0000000..6aee1bf
--- /dev/null
+++ b/sheldon.toml
@@ -0,0 +1,34 @@
+# `sheldon` configuration file
+# ----------------------------
+#
+# You can modify this file directly or you can use one of the following
+# `sheldon` commands which are provided to assist in editing the config file:
+#
+# - `sheldon add` to add a new plugin to the config file
+# - `sheldon edit` to open up the config file in the default editor
+# - `sheldon remove` to remove a plugin from the config file
+#
+# See the documentation for more https://github.com/rossmacarthur/sheldon#readme
+
+shell = "zsh"
+
+[templates]
+defer = { value = 'zsh-defer source "{{ file }}"', each = true }
+
+[plugins]
+
+[plugins.zsh-defer]
+github = "romkatv/zsh-defer"
+
+[plugins.zsh-syntax-highlighting]
+github = "zsh-users/zsh-syntax-highlighting"
+apply = ["defer"]
+
+[plugins.zsh-substring-search]
+github = "zsh-users/zsh-history-substring-search"
+apply = ["defer"]
+
+[plugins.zsh-autosuggestions]
+github = "zsh-users/zsh-autosuggestions"
+apply = ["defer"]
+use = ["{{ name }}.zsh"]
diff --git a/zshrc.zsh b/zshrc.zsh
index c287e54..9606640 100644
--- a/zshrc.zsh
+++ b/zshrc.zsh
@@ -44,7 +44,7 @@ if [[ -f /usr/libexec/path_helper ]]; then
 fi
 
 # Add our own dirs to the $PATH
-export PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/opt/homebrew/sbin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/.local/bin"
+export PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/opt/homebrew/sbin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/.local/bin:$PATH"
 export MANPATH="/opt/homebrew/manpages:/usr/local/man:$MANPATH"
 
 # Determine the running OS