From 0240c60d20e8962870f5ed9e49175665d2be17d5 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Sat, 29 Oct 2022 13:54:13 +0000
Subject: [PATCH] Update dotfiles/.zshrc, .zshrc.sh

---
 .zshrc.sh       | 147 +++++++++++++++++++++++++++++
 dotfiles/.zshrc | 244 +++++++++++++-----------------------------------
 2 files changed, 213 insertions(+), 178 deletions(-)
 create mode 100644 .zshrc.sh

diff --git a/.zshrc.sh b/.zshrc.sh
new file mode 100644
index 00000000..852caff8
--- /dev/null
+++ b/.zshrc.sh
@@ -0,0 +1,147 @@
+
+# ------------------------------- ZSH PLUGINS ---------------------------------
+# Plugin source helper
+_source_plugin() {
+	local plugin_name="$1"
+	for basedir in /usr/share/zsh/plugins /usr/share; do
+		plugin="$basedir/$plugin_name/$plugin_name.zsh"
+		[ -f "$plugin" ] && source "$plugin" && return 0
+	done
+	echo "\033[33m[ ! ]\033[0m ZSH ${plugin_name#zsh-} not installed"
+	return 1
+}
+
+# ZSH Autosuggestions
+_source_plugin zsh-autosuggestions && ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999'
+
+# ZSH Syntax Highlighting
+if _source_plugin zsh-syntax-highlighting; then
+	ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
+	ZSH_HIGHLIGHT_STYLES[default]=none
+	ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=white,underline
+	ZSH_HIGHLIGHT_STYLES[reserved-word]=fg=cyan,bold
+	ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=green,underline
+	ZSH_HIGHLIGHT_STYLES[global-alias]=fg=green,bold
+	ZSH_HIGHLIGHT_STYLES[precommand]=fg=green,underline
+	ZSH_HIGHLIGHT_STYLES[commandseparator]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[autodirectory]=fg=green,underline
+	ZSH_HIGHLIGHT_STYLES[path]=bold
+	ZSH_HIGHLIGHT_STYLES[path_pathseparator]=
+	ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=
+	ZSH_HIGHLIGHT_STYLES[globbing]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[history-expansion]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[command-substitution]=none
+	ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[process-substitution]=none
+	ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=fg=green
+	ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=fg=green
+	ZSH_HIGHLIGHT_STYLES[back-quoted-argument]=none
+	ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[single-quoted-argument]=fg=yellow
+	ZSH_HIGHLIGHT_STYLES[double-quoted-argument]=fg=yellow
+	ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]=fg=yellow
+	ZSH_HIGHLIGHT_STYLES[rc-quote]=fg=magenta
+	ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[assign]=none
+	ZSH_HIGHLIGHT_STYLES[redirection]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[comment]=fg=black,bold
+	ZSH_HIGHLIGHT_STYLES[named-fd]=none
+	ZSH_HIGHLIGHT_STYLES[numeric-fd]=none
+	ZSH_HIGHLIGHT_STYLES[arg0]=fg=cyan
+	ZSH_HIGHLIGHT_STYLES[bracket-error]=fg=red,bold
+	ZSH_HIGHLIGHT_STYLES[bracket-level-1]=fg=blue,bold
+	ZSH_HIGHLIGHT_STYLES[bracket-level-2]=fg=green,bold
+	ZSH_HIGHLIGHT_STYLES[bracket-level-3]=fg=magenta,bold
+	ZSH_HIGHLIGHT_STYLES[bracket-level-4]=fg=yellow,bold
+	ZSH_HIGHLIGHT_STYLES[bracket-level-5]=fg=cyan,bold
+	ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]=standout
+fi
+
+unset -f _source_plugin
+
+# POWERLEVEL
+if ! [[ $(tty) = /dev/tty* ]]; then
+	if source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme 2> /dev/null; then
+		s=' ' # fix too wide icons
+		POWERLEVEL9K_MODE=nerdfont-complete
+		POWERLEVEL9K_SHORTEN_STRATEGY=truncate_beginning
+		POWERLEVEL9K_PROMPT_ADD_NEWLINE=true
+		POWERLEVEL9K_PROMPT_ON_NEWLINE=true
+		POWERLEVEL9K_RPROMPT_ON_NEWLINE=true
+		POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+    # shellcheck disable=SC2016
+		POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='${P9K_CONTENT} $(whoami | grep -v "^root\$")'
+		POWERLEVEL9K_OS_ICON_BACKGROUND=red
+		POWERLEVEL9K_OS_ICON_FOREGROUND=white
+		POWERLEVEL9K_ROOT_INDICATOR_BACKGROUND=black
+		POWERLEVEL9K_ROOT_INDICATOR_FOREGROUND=red
+		POWERLEVEL9K_SSH_BACKGROUND=white
+		POWERLEVEL9K_SSH_FOREGROUND=blue
+		POWERLEVEL9K_FOLDER_ICON=
+		POWERLEVEL9K_DIR_BACKGROUND=blue
+		POWERLEVEL9K_DIR_FOREGROUND=black
+		POWERLEVEL9K_DIR_WRITABLE_BACKGROUND=black
+		POWERLEVEL9K_DIR_WRITABLE_FOREGROUND=red
+		POWERLEVEL9K_VCS_CLEAN_FOREGROUND=black
+		POWERLEVEL9K_VCS_CLEAN_BACKGROUND=green
+		POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=black
+		POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND=yellow
+		POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=white
+		POWERLEVEL9K_VCS_MODIFIED_BACKGROUND=black
+		POWERLEVEL9K_VCS_UNTRACKED_ICON=●
+		POWERLEVEL9K_VCS_UNSTAGED_ICON=±
+		POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=↓
+		POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=↑
+		POWERLEVEL9K_VCS_COMMIT_ICON=$s
+		POWERLEVEL9K_STATUS_VERBOSE=false
+		POWERLEVEL9K_STATUS_VERBOSE=false
+		POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE=true
+		POWERLEVEL9K_EXECUTION_TIME_ICON=$s
+		POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
+		POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND=black
+		POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=blue
+		POWERLEVEL9K_COMMAND_BACKGROUND_JOBS_BACKGROUND=black
+		POWERLEVEL9K_COMMAND_BACKGROUND_JOBS_FOREGROUND=cyan
+		POWERLEVEL9K_TIME_ICON=
+		POWERLEVEL9K_TIME_FORMAT='%D{%I:%M}'
+		POWERLEVEL9K_TIME_BACKGROUND=black
+		POWERLEVEL9K_TIME_FOREGROUND=white
+		POWERLEVEL9K_RAM_ICON=
+		POWERLEVEL9K_RAM_FOREGROUND=black
+		POWERLEVEL9K_RAM_BACKGROUND=yellow
+		POWERLEVEL9K_VI_MODE_FOREGROUND=black
+		POWERLEVEL9K_VI_COMMAND_MODE_STRING=NORMAL
+		POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND=green
+		POWERLEVEL9K_VI_VISUAL_MODE_STRING=VISUAL
+		POWERLEVEL9K_VI_MODE_VISUAL_BACKGROUND=blue
+		POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVERTYPE
+		POWERLEVEL9K_VI_MODE_OVERWRITE_BACKGROUND=red
+		POWERLEVEL9K_VI_INSERT_MODE_STRING=
+		POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
+		POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
+		POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%F{blue}╭─'
+		POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%F{blue}╰%f '
+		POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon root_indicator ssh dir dir_writable vcs)
+		POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(vi_mode status command_execution_time background_jobs time ram)
+		unset s
+	else
+		echo '\033[33m[ ! ]\033[0m ZSH powerlevel10k not installed'
+	fi
+else
+	clear
+	echo
+	echo
+fi
+
+switch_powerlevel_multiline_prompt(){
+	[ $POWERLEVEL9K_PROMPT_ON_NEWLINE = true ] \
+		&& POWERLEVEL9K_PROMPT_ON_NEWLINE=false \
+		|| POWERLEVEL9K_PROMPT_ON_NEWLINE=true
+
+	zle && zle accept-line
+}
+zle -N switch_powerlevel_multiline_prompt
+bindkey ^P switch_powerlevel_multiline_prompt
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index a455bff3..c4dadf4b 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -15,6 +15,9 @@ WORDCHARS=${WORDCHARS//\/}
 PROMPT_EOL_MARK=
 TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'
 
+### Antigen
+export ADOTDIR="$HOME/.local/antigen"
+
 ### Powerline
 if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
@@ -82,10 +85,6 @@ bindkey '^[[6~' end-of-buffer-or-history
 bindkey '^[[Z' undo
 bindkey ' ' magic-space
 
-# Prompt
-PROMPT=$'%F{%(#.blue.green)}┌──(%B%F{%(#.red.blue)}%n@%m%b%F{%(#.blue.green)})-[%B%F{reset}%(6~.%-1~/…/%4~.%5~)%b%F{%(#.blue.green)}]\n└─%B%(#.%F{red}#.%F{blue}$)%b%F{reset} '
-RPROMPT=$'%(?.. %? %F{red}%Bx%b%F{reset})%(1j. %j %F{yellow}%Bbg %b%F{reset}.)'
-
 # ----------------------------------- MISC -----------------------------------
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
@@ -102,191 +101,85 @@ if type gdircolors &> /dev/null && [ -f "$HOME/.config/dircolors" ]; then
 	eval "$(gdircolors -b "$HOME/.config/dircolors")"
 fi
 
-# ------------------------------- ZSH PLUGINS ---------------------------------
-# Plugin source helper
-_source_plugin() {
-	local plugin_name="$1"
-	for basedir in /usr/share/zsh/plugins /usr/share; do
-		plugin="$basedir/$plugin_name/$plugin_name.zsh"
-		[ -f "$plugin" ] && source "$plugin" && return 0
-	done
-	echo "\033[33m[ ! ]\033[0m ZSH ${plugin_name#zsh-} not installed"
-	return 1
-}
-
-# ZSH Autosuggestions
-_source_plugin zsh-autosuggestions && ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999'
-
-# ZSH Syntax Highlighting
-if _source_plugin zsh-syntax-highlighting; then
-	ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
-	ZSH_HIGHLIGHT_STYLES[default]=none
-	ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=white,underline
-	ZSH_HIGHLIGHT_STYLES[reserved-word]=fg=cyan,bold
-	ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=green,underline
-	ZSH_HIGHLIGHT_STYLES[global-alias]=fg=green,bold
-	ZSH_HIGHLIGHT_STYLES[precommand]=fg=green,underline
-	ZSH_HIGHLIGHT_STYLES[commandseparator]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[autodirectory]=fg=green,underline
-	ZSH_HIGHLIGHT_STYLES[path]=bold
-	ZSH_HIGHLIGHT_STYLES[path_pathseparator]=
-	ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=
-	ZSH_HIGHLIGHT_STYLES[globbing]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[history-expansion]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[command-substitution]=none
-	ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[process-substitution]=none
-	ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=fg=green
-	ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=fg=green
-	ZSH_HIGHLIGHT_STYLES[back-quoted-argument]=none
-	ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[single-quoted-argument]=fg=yellow
-	ZSH_HIGHLIGHT_STYLES[double-quoted-argument]=fg=yellow
-	ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]=fg=yellow
-	ZSH_HIGHLIGHT_STYLES[rc-quote]=fg=magenta
-	ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[assign]=none
-	ZSH_HIGHLIGHT_STYLES[redirection]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[comment]=fg=black,bold
-	ZSH_HIGHLIGHT_STYLES[named-fd]=none
-	ZSH_HIGHLIGHT_STYLES[numeric-fd]=none
-	ZSH_HIGHLIGHT_STYLES[arg0]=fg=cyan
-	ZSH_HIGHLIGHT_STYLES[bracket-error]=fg=red,bold
-	ZSH_HIGHLIGHT_STYLES[bracket-level-1]=fg=blue,bold
-	ZSH_HIGHLIGHT_STYLES[bracket-level-2]=fg=green,bold
-	ZSH_HIGHLIGHT_STYLES[bracket-level-3]=fg=magenta,bold
-	ZSH_HIGHLIGHT_STYLES[bracket-level-4]=fg=yellow,bold
-	ZSH_HIGHLIGHT_STYLES[bracket-level-5]=fg=cyan,bold
-	ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]=standout
-fi
-
-unset -f _source_plugin
-
-# POWERLEVEL
-if ! [[ $(tty) = /dev/tty* ]]; then
-	if source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme 2> /dev/null; then
-		s=' ' # fix too wide icons
-		POWERLEVEL9K_MODE=nerdfont-complete
-		POWERLEVEL9K_SHORTEN_STRATEGY=truncate_beginning
-		POWERLEVEL9K_PROMPT_ADD_NEWLINE=true
-		POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-		POWERLEVEL9K_RPROMPT_ON_NEWLINE=true
-		POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
-    # shellcheck disable=SC2016
-		POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='${P9K_CONTENT} $(whoami | grep -v "^root\$")'
-		POWERLEVEL9K_OS_ICON_BACKGROUND=red
-		POWERLEVEL9K_OS_ICON_FOREGROUND=white
-		POWERLEVEL9K_ROOT_INDICATOR_BACKGROUND=black
-		POWERLEVEL9K_ROOT_INDICATOR_FOREGROUND=red
-		POWERLEVEL9K_SSH_BACKGROUND=white
-		POWERLEVEL9K_SSH_FOREGROUND=blue
-		POWERLEVEL9K_FOLDER_ICON=
-		POWERLEVEL9K_DIR_BACKGROUND=blue
-		POWERLEVEL9K_DIR_FOREGROUND=black
-		POWERLEVEL9K_DIR_WRITABLE_BACKGROUND=black
-		POWERLEVEL9K_DIR_WRITABLE_FOREGROUND=red
-		POWERLEVEL9K_VCS_CLEAN_FOREGROUND=black
-		POWERLEVEL9K_VCS_CLEAN_BACKGROUND=green
-		POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=black
-		POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND=yellow
-		POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=white
-		POWERLEVEL9K_VCS_MODIFIED_BACKGROUND=black
-		POWERLEVEL9K_VCS_UNTRACKED_ICON=●
-		POWERLEVEL9K_VCS_UNSTAGED_ICON=±
-		POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=↓
-		POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=↑
-		POWERLEVEL9K_VCS_COMMIT_ICON=$s
-		POWERLEVEL9K_STATUS_VERBOSE=false
-		POWERLEVEL9K_STATUS_VERBOSE=false
-		POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE=true
-		POWERLEVEL9K_EXECUTION_TIME_ICON=$s
-		POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
-		POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND=black
-		POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=blue
-		POWERLEVEL9K_COMMAND_BACKGROUND_JOBS_BACKGROUND=black
-		POWERLEVEL9K_COMMAND_BACKGROUND_JOBS_FOREGROUND=cyan
-		POWERLEVEL9K_TIME_ICON=
-		POWERLEVEL9K_TIME_FORMAT='%D{%I:%M}'
-		POWERLEVEL9K_TIME_BACKGROUND=black
-		POWERLEVEL9K_TIME_FOREGROUND=white
-		POWERLEVEL9K_RAM_ICON=
-		POWERLEVEL9K_RAM_FOREGROUND=black
-		POWERLEVEL9K_RAM_BACKGROUND=yellow
-		POWERLEVEL9K_VI_MODE_FOREGROUND=black
-		POWERLEVEL9K_VI_COMMAND_MODE_STRING=NORMAL
-		POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND=green
-		POWERLEVEL9K_VI_VISUAL_MODE_STRING=VISUAL
-		POWERLEVEL9K_VI_MODE_VISUAL_BACKGROUND=blue
-		POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVERTYPE
-		POWERLEVEL9K_VI_MODE_OVERWRITE_BACKGROUND=red
-		POWERLEVEL9K_VI_INSERT_MODE_STRING=
-		POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
-		POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
-		POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%F{blue}╭─'
-		POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%F{blue}╰%f '
-		POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon root_indicator ssh dir dir_writable vcs)
-		POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(vi_mode status command_execution_time background_jobs time ram)
-		unset s
-	else
-		echo '\033[33m[ ! ]\033[0m ZSH powerlevel10k not installed'
-	fi
-else
-	clear
-	echo
-	echo
-fi
-
-switch_powerlevel_multiline_prompt(){
-	[ $POWERLEVEL9K_PROMPT_ON_NEWLINE = true ] \
-		&& POWERLEVEL9K_PROMPT_ON_NEWLINE=false \
-		|| POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-
-	zle && zle accept-line
-}
-zle -N switch_powerlevel_multiline_prompt
-bindkey ^P switch_powerlevel_multiline_prompt
-
 ### Antigen
 if [ -f "$HOME/.local/antigen.zsh" ]; then
   source "$HOME/.local/antigen.zsh"
 fi
 if command -v antigen > /dev/null; then
   antigen use oh-my-zsh
-  antigen bundle marlonrichert/zsh-autocomplete@main
-  antigen bundle git
+  antigen theme romkatv/powerlevel10k
+  antigen bundle zsh-users/zsh-completions
+  antigen bundle zsh-users/zsh-autosuggestions
+  antigen bundle zsh-users/zsh-syntax-highlighting
+  antigen bundle adb
+  antigen bundle ansible
+  antigen bundle asdf
+  antigen bundle aws
   antigen bundle bundler
+  antigen bundle colored-man-pages
+  antigen bundle codeclimate
+  antigen bundle colorize
+  antigen bundle command-not-found
+  antigen bundle copyfile
+  antigen bundle copybuffer
+  antigen bundle cp
+  antigen bundle deno
+  antigen bundle docker
+  antigen bundle docker-compose
   antigen bundle dotenv
+  antigen bundle encode64
+  antigen bundle fd
+  antigen bundle fig
+  antigen bundle fzf
+  antigen bundle gcloud
+  antigen bundle gh
+  antigen bundle git
+  antigen bundle git-auto-fetch
+  antigen bundle gnu-utils
+  antigen bundle golang
+  antigen bundle gpg-agent
+  antigen bundle gradle
+  antigen bundle helm
+  antigen bundle heroku
+  antigen bundle httpie
+  antigen bundle ionic
+  antigen bundle keychain
+  antigen bundle kubectl
   antigen bundle macos
+  antigen bundle macports
+  antigen bundle magic-enter
+  antigen bundle microk8s
+  antigen bundle minikube
+  antigen bundle multipass
+  antigen bundle npm
+  antigen bundle pass
+  antigen bundle pip
+  antigen bundle pm2
+  antigen bundle poetry
   antigen bundle rake
   antigen bundle rbenv
+  antigen bundle repo
+  antigen bundle ripgrep
   antigen bundle ruby
+  antigen bundle salt
+  antigen bundle safe-paste
+  antigen bundle shell-proxy
+  antigen bundle ssh-agent
+  antigen bundle sudo
+  antigen bundle terraform
+  antigen bundle tmux
+  antigen bundle transfer
+  antigen bundle ubuntu
+  antigen bundle ufw
+  antigen bundle vagrant
+  antigen bundle volta
+  antigen bundle wp-cli
+  antigen bundle yarn
+  antigen bundle zoxide
   antigen bundle k
   antigen apply
 fi
 
-### FZF
-if command -v fzf > /dev/null; then
-  if [ -f "$HOME/.local/fzf/completion.zsh" ]; then
-    source "$HOME/.local/fzf/completion.zsh"
-  fi
-  if [ -f "$HOME/.local/fzf/key-bindings.zsh" ]; then
-    source "$HOME/.local/fzf/key-bindings.zsh"
-  fi
-fi
-
-### Google Cloud SDK
-if command -v brew > /dev/null; then
-  if [ -f "$(brew --prefix)/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc" ]; then
-	source "$(brew --prefix)/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
-  fi
-  if [ -f "$(brew --prefix)/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc" ]; then
-  	source "$(brew --prefix)/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
-  fi
-fi
-
 ### Hyperfine
 if command -v hyperfine > /dev/null && [ -f /usr/local/src/hyperfine/autocomplete/hyperfine.zsh-completion ]; then
   source /usr/local/src/hyperfine/autocomplete/hyperfine.zsh-completion
@@ -303,11 +196,6 @@ if command -v mcfly > /dev/null; then
   eval "$(mcfly init zsh)"
 fi
 
-### zoxide
-if command -v zoxide > /dev/null; then
-	eval "$(zoxide init zsh)"
-fi
-
 ### Fig
 if [ -f "$HOME/.fig/shell/zshrc.post.zsh" ]; then
 	source "$HOME/.fig/shell/zshrc.post.zsh"