USe sheldon to load plugins and source extra commands

zsh/aliases.zsh

@@ -1,27 +0,0 @@
-# aliases.zsh
-
-alias auao="sudo apt update && apt list --upgradable"
-alias aupg="sudo apt upgrade"
-alias aurup="sudo aura -Akua"
-alias bubc="brew upgrade && brew cleanup"
-alias bubo="brew update && brew outdated"
-test $PLATFORM = 'osx' && alias brewcurl="/usr/local/opt/curl/bin/curl --cacert /usr/local/etc/openssl@1.1/cert.pem"
-test $PLATFORM = 'osx-m1' && alias brewcurl="/opt/homebrew/opt/curl/bin/curl"
-test $PLATFORM = 'osx' && alias brewssl="/usr/local/opt/openssl@1.1/bin/openssl"
-alias ga="git add"
-alias gf="git fetch --all; git fetch --tags"
-alias gs="git status"
-alias gb="git rev-parse --abbrev-ref HEAD"
-alias irc="ssh jmb -t '. ~/.zshrc; tmux attach -t irc'"
-test $PLATFORM = 'linux' && alias ls="ls -F --color=always"
-test $PLATFORM = 'osx' && alias ls="ls -FG"
-test $PLATFORM = 'osx-m1' && alias ls="ls -FG"
-test $PLATFORM = 'linux' && alias pipup="pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 sudo pip install -U"
-test $PLATFORM = 'osx' && alias pipup="pip3 freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip3 install -U"
-test $PLATFORM = 'osx-m1' && alias pipup="pip3 freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip3 install -U"
-alias rtor="tmux attach -t rtor"
-alias startace="acestreamengine --client-console --upload-limit 0 --download-limit 0"
-alias up="sudo pacman -Syu"
-alias aws-whoami="aws sts get-caller-identity"
-alias als="eza --oneline --long --classify --icons --header"
-alias sail="[ -f sail ] && bash sail || bash vendor/bin/sail"

zsh/fzf-completions.zsh

@@ -3,7 +3,6 @@ test -e /opt/homebrew/opt/fzf/shell/completion.zsh && source /opt/homebrew/opt/f
 test -e /usr/share/fzf/completion.zsh && source /usr/share/fzf/completion.zsh
 
 # cURL completions copied from https://blog.revathskumar.com/2024/02/curl-fuzzy-search-options-using-fzf.html
-
 _fzf_complete_curl() {
   _fzf_complete --header-lines=1  --prompt="curl> " -- "$@" < <(
     curl -h all

zsh/platform.zsh

@@ -1,14 +0,0 @@
-export PLATFORM="unkown"
-
-osname=$(uname -s)
-cputype=$(uname -m)
-
-if [[ "$osname" == 'Linux' ]]; then
-    export PLATFORM="linux"
-elif [[ "$osname" == 'Darwin' ]]; then
-    if [[ "$cputpye" == 'x86_64' ]]; then
-        export PLATFORM="osx"
-    elif [[ "$cputype" == 'arm64' ]]; then
-        export PLATFORM="osx-m1"
-    fi
-fi

zsh/plugins/aliases.plugin.zsh

@@ -0,0 +1,14 @@
+#!/usr/bin/env zsh
+
+# Homebrew commands
+alias bubc="brew upgrade && brew cleanup"
+alias bubo="brew update && brew outdated"
+
+# See which user or profile we are authneticated as in aws-cli
+alias aws-whoami="aws sts get-caller-identity"
+
+# Use eza instead of ls
+alias als="eza --oneline --long --classify --icons --header"
+
+# Laravel Sail
+alias sail="[ -f sail ] && bash sail || bash vendor/bin/sail"

zsh/plugins/compinit.plugin.zsh

@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+
+# Load all stock functions (from $fpath files) called below.
+autoload -U compaudit compinit
+
+# Figure out the SHORT hostname
+if [[ "$OSTYPE" = darwin* ]]; then
+  # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
+else
+  SHORT_HOST=${HOST/.*/}
+fi
+
+# Save the location of the current completion dump file.
+ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+
+# Construct zcompdump metadata, we will rebuild the Zsh compdump if either
+# this file changes or the fpath changes.
+zcompdump_revision="#revision: $(sha1sum $0:A)"
+zcompdump_fpath="#fpath: $fpath"
+
+# Delete the zcompdump file if zcompdump metadata changed
+if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
+   || ! command grep -q -Fx "$zcompdump_fpath" "$ZSH_COMPDUMP" 2>/dev/null; then
+  command rm -f "$ZSH_COMPDUMP"
+  zcompdump_refresh=1
+fi
+
+# If the user wants it, load from all found directories
+compinit -u -C -d "${ZSH_COMPDUMP}"
+
+# Append zcompdump metadata if missing
+if (( $zcompdump_refresh )); then
+  echo "\n$zcompdump_revision\n$zcompdump_fpath" >>! "$ZSH_COMPDUMP"
+fi
+
+unset zcompdump_revision zcompdump_fpath zcompdump_refresh

zsh/plugins/fnm.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# Setup Fast Node Manager
+if type fnm > /dev/null; then
+  eval "$(fnm env --use-on-cd)"
+fi

zsh/plugins/functions.plugin.zsh

@@ -2,34 +2,8 @@
 
 # Functions
 
-# Generate TLS certs using a local CA
-gencert () {
-  DOMAIN=$1
-
-  test -d /usr/local/opt/openssl@1.1/bin && PATH='/usr/local/opt/openssl@1.1/bin':$PATH
-  test -d /opt/homebrew/opt/openssl@1.1/bin && PATH='/opt/homebrew/opt/openssl@1.1/bin':$PATH
-  test -f /usr/local/etc/openssl@1.1/openssl.cnf && SSLCNF='/usr/local/etc/openssl@1.1/openssl.cnf'
-  test -f /opt/homebrew/etc/openssl@1.1/openssl.cnf && SSLCNF='/opt/homebrew/etc/openssl@1.1/openssl.cnf'
-  test -f /etc/ssl/openssl.cnf && SSLCNF='/etc/ssl/openssl.cnf'
-
-  cd $HOME/git/ca
-  [[ ! -d $DOMAIN ]] && mkdir $DOMAIN
-  cd $DOMAIN
-  [[ -f key ]] && mv key key.bak
-  [[ -f csr ]] && mv csr csr.bak
-  [[ -f crt ]] && mv crt crt.bak
-
-  openssl ecparam -name secp384r1 -genkey -noout -out key
-  chmod 644 key
-  openssl req -new -sha256 -key key -subj "/C=UK/ST=England/L=Bury/O=JMB Dev Ltd/CN=$DOMAIN" -reqexts SAN -config <(cat $SSLCNF <(printf "[SAN]\nsubjectAltName=DNS:$DOMAIN")) -out csr
-  openssl x509 -req -in csr -extfile <(cat $SSLCNF <(printf "[SAN]\nsubjectAltName=DNS:$DOMAIN")) -extensions SAN -CA ../jmb-ca-ecc.pem -CAkey ../jmb-ca-ecc.key -CAcreateserial -days 90 -sha256 -out crt
-
-  cd $HOME/git/ca
-  echo 'Certs generated for $DOMAIN'
-}
-
 # Delete branches selected via fzf
-delete-branches () {
+function delete-branches() {
   git branch |
     grep --invert-match '\*' | # Remove current branch
     fzf --multi --preview="git log {..}" |
@@ -37,7 +11,7 @@ delete-branches () {
 }
 
 # Delete branches selected via fzf (force the deletion)
-delete-branches-force () {
+function delete-branches-force() {
   git branch |
     grep --invert-match '\*' | # Remove current branch
     fzf --multi --preview="git log {..}" |

zsh/plugins/fzf.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# Setup fzf completions
+if type fzf > /dev/null; then
+  eval "$(fzf --zsh)"
+fi

zsh/plugins/github-copilot.plugin.zsh

@@ -0,0 +1,10 @@
+#!/usr/bin/env zsh
+
+# Setup GitHub Copilot
+# first check we even have the genereic `gh` command
+if type gh > /dev/null; then
+  # Now check we have the copilot plugin installed with `gh`
+  if gh extension list | rg copilot -c > /dev/null; then
+    eval "$(gh copilot alias -- zsh)"
+  fi
+fi

zsh/plugins/mcfly.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# McFly
+if type mcfly > /dev/null; then
+  eval "$(mcfly init zsh)"
+fi

zsh/plugins/ngrok.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# ngrok completions
+if command -v ngrok &>/dev/null; then
+  eval "$(ngrok completion)"
+fi

zsh/plugins/thefuck.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# Init the fuck
+if type thefuck > /dev/null; then
+  eval "$(thefuck --alias)"
+fi

zsh/plugins/zoxide.plugin.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# zoxide - a better `cd` command
+if command -v zoxide &>/dev/null; then
+  eval "$(zoxide init zsh)"
+fi

zsh/zsh-autosuggestions.zsh

@@ -1,7 +0,0 @@
-# ZSH autosuggestions
-test -e /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh \
-&& source /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-test -e /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \
-&& source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-test -e /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh \
-&& source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh

zsh/zsh-substring-search.zsh

@@ -1,20 +0,0 @@
-# ZSH substring search
-bindKeysZshHistoryMacOS() {
-    zmodload zsh/terminfo
-    bindkey "$terminfo[kcuu1]" history-substring-search-up
-    bindkey "$terminfo[kcud1]" history-substring-search-down
-}
-bindKeysZshHistoryLinux() {
-    zmodload zsh/terminfo
-    bindkey "$terminfo[cuu1]" history-substring-search-up
-    bindkey "$terminfo[cud1]" history-substring-search-down
-}
-test -e /usr/local/opt/zsh-history-substring-search/zsh-history-substring-search.zsh \
-&& source /usr/local/opt/zsh-history-substring-search/zsh-history-substring-search.zsh
-test -e /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh \
-&& source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-test -e /opt/homebrew/share/zsh-history-substring-search/zsh-history-substring-search.zsh \
-&& source /opt/homebrew/share/zsh-history-substring-search/zsh-history-substring-search.zsh
-test $PLATFORM = 'osx' && bindKeysZshHistoryMacOS
-test $PLATFORM = 'osx-m1' && bindKeysZshHistoryMacOS
-test $PLATFORM = 'linux' && bindKeysZshHistoryLinux

zsh/zsh-syntax-highlighting.zsh

@@ -1,7 +0,0 @@
-# ZSH syntax highlghting
-test -e /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-&& source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-test -e /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-&& source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-test -e /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-&& source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh