From eddd551856ddeadcbf9d46733a8f03fbef3ea1bd Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Mon, 15 May 2023 01:42:09 +0000
Subject: [PATCH] Latest

---
 home/.chezmoidata.yaml |  2 ++
 home/dot_bashrc        |  5 +++++
 home/dot_zshrc         | 35 +++++++++++++++++++++++++++--------
 software.yml           | 20 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 8e712b70..fb7e641e 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -322,7 +322,9 @@ softwareGroups:
     - speed-test
     - statcode
     - stegcloak
+    - thefuck
     - tldr
+    - tmuxinator
     - up
     - yank
   Cloud: &Cloud
diff --git a/home/dot_bashrc b/home/dot_bashrc
index 116e8605..d4a152c7 100644
--- a/home/dot_bashrc
+++ b/home/dot_bashrc
@@ -101,6 +101,11 @@ if [ "$BASH_SUPPORT" = 'true' ]; then
     . "$HOME/.fig/shell/bashrc.post.bash"
   fi
 
+  ### The Fuck
+  if command -v thefuck > /dev/null; then
+	  eval "$(thefuck --alias)"
+  fi
+
   ### Vault
   if command -v vault > /dev/null; then
     complete -C vault vault
diff --git a/home/dot_zshrc b/home/dot_zshrc
index b4e3e73e..daefc6a1 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -79,6 +79,12 @@ zstyle ':completion:*' use-compctl false
 zstyle ':completion:*' verbose true
 # shellcheck disable=SC2016
 zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
+zstyle ':completion:*:git-checkout:*' sort false
+zstyle ':completion:*:descriptions' format '[%d]'
+if command -v fzf > /dev/null && command -v exa > /dev/null; then
+  zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1 --color=always $realpath'
+  zstyle ':fzf-tab:*' switch-group ',' '.'
+fi
 
 # Key bindings
 bindkey -e
@@ -336,16 +342,18 @@ if command -v antigen > /dev/null; then
   antigen bundle sprunge
   # antigen bundle ssh-agent
   antigen bundle sudo
+  antigen bundle terraform
+  antigen bundle thefuck
+  antigen bundle timer
+  antigen bundle tmuxinator
+  antigen bundle urltools
   antigen bundle ufw
+  antigen bundle vagrant
+  antigen bundle volta
   antigen bundle web-search
+  antigen bundle wp-cli
   antigen bundle docker
   antigen bundle docker-compose
-  antigen bundle ionic
-  antigen bundle multipass
-  antigen bundle pip
-  antigen bundle pm2
-  antigen bundle terraform
-  antigen bundle vagrant
   antigen bundle yarn
 
   # Third-party plugins
@@ -355,9 +363,15 @@ if command -v antigen > /dev/null; then
   antigen bundle zsh-interactive-cd
   # antigen bundle zsh-navigation-tools
   antigen bundle zsh-users/zsh-completions src
-  antigen bundle zsh-users/zsh-syntax-highlighting
-  antigen bundle zsh-users/zsh-autosuggestions
+  if command -v fzf > /dev/null; then
+  	antigen bundle aloxaf/fzf-tab
+  fi
   antigen bundle marlonrichert/zsh-autocomplete@main
+  antigen bundle zsh-users/zsh-autosuggestions
+  antigen bundle zsh-users/zsh-syntax-highlighting
+  if [ -d /Applications ] && [ -d /System ]; then
+  	antigen bundle zsh-apple-touchbar
+  fi
   antigen theme romkatv/powerlevel10k
   antigen apply
 fi
@@ -403,6 +417,11 @@ if [ -f "$HOME/.local/scripts/p10k.zsh" ]; then
 	source "$HOME/.local/scripts/p10k.zsh"
 fi
 
+### The Fuck
+if command -v thefuck > /dev/null; then
+	eval "$(thefuck --alias)"
+fi
+
 ### Bash Completions
 autoload -U +X bashcompinit && bashcompinit
 
diff --git a/software.yml b/software.yml
index 90692858..e4cadc7f 100644
--- a/software.yml
+++ b/software.yml
@@ -955,6 +955,18 @@ softwarePackages:
     scoop: bottom
     snap: bottom
     _type: cli
+  thefuck:
+    _bin: fuck
+    _desc: Magnificent CLI tool that corrects your previous console command whenever something fails due to misspelling.
+    _docs: https://github.com/nvbn/thefuck
+    _github: https://github.com/nvbn/thefuck
+    _home: https://github.com/nvbn/thefuck
+    _name: The Fuck
+    brew: thefuck
+    crew: thefuck
+    pacman: thefuck
+    pipx: thefuck
+    pkg-freebsd: thefuck
   cod:
     _bin: cod
     _todo: Check for brew install later on (5/14/2023)
@@ -7516,6 +7528,14 @@ softwarePackages:
     brew: tldr
     npm: tldr
     _type: cli
+  tmuxinator:
+    _bin: tmuxinator
+    _desc: Manage complex tmux sessions easily
+    _docs: https://github.com/tmuxinator/tmuxinator
+    _github: https://github.com/tmuxinator/tmuxinator
+    _home: https://github.com/tmuxinator/tmuxinator
+    _name: Tmuxinator
+    brew: tmuxinator
   tmux:
     _bin: tmux
     _desc: '[Tmux](https://github.com/tmux/tmux/wiki) is a terminal multiplexer. It enables a number of terminals to be created, accessed, and controlled from a single screen. Tmux may be detached from a screen and continue running in the background, then later reattached.'