From e79b29243b7d57ca91a278af7d9fb6b3fecc573b Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Tue, 16 Jan 2024 02:01:44 +0000
Subject: [PATCH] Latest

---
 home/.chezmoidata.yaml                 |  2 -
 home/.chezmoiexternal.toml.tmpl        |  5 ++
 home/.chezmoitemplates/darwin/Brewfile |  1 +
 home/dot_bashrc                        |  3 +
 home/dot_zshrc                         |  4 ++
 software.yml                           | 83 ++++++++++++++------------
 6 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 030bc92b..34ffb49c 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -291,7 +291,6 @@ softwareGroups:
     - glances
     - glow
     - gnu
-    - goto
     - gping
     - gum
     - hoard
@@ -614,7 +613,6 @@ softwareGroups:
   Git: &Git
     - aicommits
     - commitizen
-    - forgit
     - gh
     - gist
     - git
diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl
index 33008ad0..aa14d38e 100644
--- a/home/.chezmoiexternal.toml.tmpl
+++ b/home/.chezmoiexternal.toml.tmpl
@@ -176,6 +176,11 @@
     url = "https://github.com/bigH/git-fuzzy.git"
     {{ $gitArgs }}
 
+### Goto
+[".config/shell/goto.sh"]
+    type = "file"
+    url = "https://raw.githubusercontent.com/iridakos/goto/master/goto.sh"
+
 ### LSColors
 [".config/shell/lscolors.sh"]
     type = "file"
diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile
index 891dc66c..a31add0d 100644
--- a/home/.chezmoitemplates/darwin/Brewfile
+++ b/home/.chezmoitemplates/darwin/Brewfile
@@ -14,6 +14,7 @@ brew "age"
 # Ensure macOS Bash gets upgraded to 5+
 brew "bash"
 brew "expect"
+brew "fzf"
 brew "gawk"
 brew "git-delta"
 brew "glow"
diff --git a/home/dot_bashrc b/home/dot_bashrc
index 67714464..4c656f46 100644
--- a/home/dot_bashrc
+++ b/home/dot_bashrc
@@ -134,6 +134,9 @@ if [ "$BASH_SUPPORT" = 'true' ] && [ -n "$BASH" ]; then
   ### Emplace
   ! command -v emplace > /dev/null || source <(emplace init bash)
 
+  ### Goto
+  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/goto.sh" ] || source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/goto.sh"
+  
   ### hiSHtory
   if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/hishtory/config.sh" ]; then
 	  export PATH="$PATH:${XDG_CONFIG_HOME:-$HOME/.config}/hishtory"
diff --git a/home/dot_zshrc b/home/dot_zshrc
index fbc46a62..11e7b0d2 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -362,6 +362,7 @@ if command -v antigen > /dev/null; then
   # Third-party plugins
   # antigen bundle jscutlery/nx-completion Installing jscutlery/nx-completion... Error! Activate logging and try again.
   # antigen bundle lukechilds/zsh-better-npm-completion
+  antigen bundle wfxr/forgit
 
   antigen bundle zsh-interactive-cd
   antigen bundle zsh-navigation-tools
@@ -432,6 +433,9 @@ fi
 [ ! -f "$HOMEBREW_PREFIX/share/google-cloud-sdk/path.zsh.inc" ] || source "$HOMEBREW_PREFIX/share/google-cloud-sdk/path.zsh.inc"
 [ ! -f "$HOMEBREW_PREFIX/share/google-cloud-sdk/completion.zsh.inc" ] || source "$HOMEBREW_PREFIX/share/google-cloud-sdk/completion.zsh.inc"
 
+### Goto
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/goto.sh" ] || source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/goto.sh"
+
 ### hiSHtory
 export PATH="$PATH:${XDG_CONFIG_HOME:-$HOME/.config}/hishtory"
 [ ! -f "${XDG_CONFIG_HOME:-$HOME/.config}/hishtory/config.zsh" ] || source "${XDG_CONFIG_HOME:-$HOME/.config}/hishtory/config.zsh"
diff --git a/software.yml b/software.yml
index 1ca2c6b7..abd18ec0 100644
--- a/software.yml
+++ b/software.yml
@@ -285,7 +285,7 @@ softwarePackages:
     msix: https://tvd-packages.tradingview.com/stable/latest/win32/TradingView.msix
     snap: tradingview
   fabric:
-    _bin: fabric
+    _bin: fab
     _github: https://github.com/fabric/fabric
     _name: Fabric
     brew: fabric
@@ -479,7 +479,7 @@ softwarePackages:
     brew: lindell/multi-gitter/multi-gitter
     go: github.com/lindell/multi-gitter@latest
   tomcat:
-    _bin: tomcat
+    _bin: catalina
     _github: https://github.com/apache/tomcat
     _name: Tomcat
     _post:darwin: |
@@ -1614,7 +1614,7 @@ softwarePackages:
     _name: Cod
     go: github.com/dim-an/cod@master
   iproute2mac:
-    _bin:
+    _bin: ip
     _github: https://github.com/brona/iproute2mac
     _name: iproute2mac
     brew:darwin: iproute2mac
@@ -1632,16 +1632,13 @@ softwarePackages:
     zypper: tmate
     emerge: app-misc/tmate
   sphinx:
-    _bin: sphinx
+    _bin: sphinx-build
     _github: https://github.com/sphinx-doc/sphinx
     _name: Sphinx
     apt: python3-sphinx
-    brew: sphinx-doc
     choco: sphinx
-    conda: sphinx
     dnf: python-sphinx
     pipx: sphinx
-    port: py39-sphinx
   you-get:
     _bin: you-get
     _github: https://github.com/soimort/you-get
@@ -1833,7 +1830,7 @@ softwarePackages:
     pkgin: broot
     port: broot
   rsyslog:
-    _bin: rsyslog
+    _bin: rsyslogd
     _github: https://github.com/rsyslog/rsyslog
     _name: RSyslog
     _service: rsyslog
@@ -2807,8 +2804,9 @@ softwarePackages:
     _docs: https://docs.trunk.io/
     _github:
     _home: https://trunk.io/
-    brew: trunk-io
+    cask: trunk-io
     npm: '@trunkio/launcher'
+    script: curl https://get.trunk.io -fsSL | bash -s -- -y
   cups:
     _bin: cupsctl
     _desc: '[CUPS](https://www.cups.org/) is a modular printing system for Unix-like computer operating systems which allows a computer to act as a print server. A computer running CUPS is a host that can accept print jobs from client computers, process them, and send them to the appropriate printer.'
@@ -3287,7 +3285,7 @@ softwarePackages:
     _app: Sidekick.app
     cask: pushplaylabs-sidekick
   docker-slim:
-    _bin: docker-slim
+    _bin: slim
     _desc: "[DockerSlim](https://dockersl.im/) will optimize and secure your containers by understanding your application and what it needs using various analysis techniques. It will throw away what you don't need, reducing the attack surface of your container. What if you need some of those extra things to debug your container? You can use dedicated debugging side-car containers for that."
     _docs: https://github.com/docker-slim/docker-slim#basic-usage-info
     _github: https://github.com/docker-slim/docker-slim
@@ -3507,11 +3505,6 @@ softwarePackages:
     cargo: du-dust
     github: github.com/bootandy/dust
     pacman: dust
-  goto:
-    _bin: goto
-    _github: https://github.com/iridakos/goto
-    _name: goto
-    brew: goto
   easyengine:
     _bin: ee
     _desc: "[EasyEngine](https://easyengine.io/) is a command-line control panel for Nginx to manage WordPress sites running on Nginx, PHP, MySQL, and Let's Encrypt."
@@ -3521,13 +3514,6 @@ softwarePackages:
     _name: EasyEngine
     ansible:darwin: professormanhattan.easyengine
     ansible:linux: professormanhattan.easyengine
-  forgit:
-    _deps:
-      - fzf
-    _bin: ga
-    _github: https://github.com/wfxr/forgit
-    _name: forgit
-    brew: forgit
   clipboard:
     _bin: cb
     _github: https://github.com/Slackadays/Clipboard.git
@@ -4071,7 +4057,7 @@ softwarePackages:
     brew: wego
     go: github.com/schachmat/wego@latest
   miller:
-    _bin: miller
+    _bin: mlr
     _github: https://github.com/johnkerl/miller
     _name: Miller
     apt: miller
@@ -4584,7 +4570,7 @@ softwarePackages:
     _home: https://flutter.dev/
     _name: Flutter
     _snapClassic: true
-    brew: flutter
+    cask: flutter
     choco: flutter
     snap: flutter
     yay: flutter
@@ -5578,19 +5564,29 @@ softwarePackages:
     _github: null
     _name: Android Platform Tools
     cask: android-platform-tools
+  findutils:
+    _bin: gfind
+    brew: findutils
+  gawk:
+    _bin: gawk
+    brew: gawk
+  gnu-indent:
+    _bin: gindent
+    brew: gnu-indent
+  gnu-tar:
+    _bin: gtar
+    brew: gnu-tar
+  gnu-sed:
+    _bin: gsed
+    brew: gnu-sed
+  gnutls:
+    _bin: gnutls-certtool
+    brew: gnutls
   gnu:
-    _bin: null
-    _desc: null
-    _docs: null
-    _github: null
-    _home: null
-    _name: null
-    _when:brew:darwin: '(! brew list coreutils | grep coreutils > /dev/null) || (! brew list findutils | grep findutils > /dev/null) || (! brew list gawk | grep gawk > /dev/null) || (! brew list gnu-getopt | grep gnu-getopt > /dev/null) || (! brew list gnu-indent | grep gnu-indent > /dev/null) || (! brew list gnu-tar | grep gnu-tar > /dev/null) || (! brew list gnu-sed | grep gnu-sed > /dev/null) || (! brew list gnutls | grep gnutls > /dev/null) || (! brew list grep | grep grep > /dev/null)'
-    brew:darwin:
+    _deps:darwin:
       - coreutils
       - findutils
       - gawk
-      - gnu-getopt
       - gnu-indent
       - gnu-tar
       - gnu-sed
@@ -7365,7 +7361,7 @@ softwarePackages:
     _name: mitmproxy
     ansible: professormanhattan.mitmproxy
     apt: mitmproxy
-    brew: mitmproxy
+    cask: mitmproxy
     choco: mitmproxy
     pacman: mitmproxy
   mjml:
@@ -8436,7 +8432,7 @@ softwarePackages:
     _name: np
     npm: np
   nushell:
-    _bin: nushell
+    _bin: nu
     _github: https://github.com/nushell/nushell
     _name: Nu
     apk: nushell
@@ -8741,10 +8737,18 @@ softwarePackages:
     _name: Taplo
     cargo: taplo-cli --locked
     npm: '@taplo/cli'
+  basictex:
+    _github: false
+    _name: Basictex
+    _when: '! test -d /Library/TeX'
+    cask: basictex
   pandoc:
     _bin: pandoc
     _deps:
       - python
+    _deps:darwin:
+      - basictex
+      - python
     _desc: '[Pandoc](https://pandoc.org/) is a Haskell library for converting from one documentation markup format to another. If you need to convert files from one markup format into another, then look no further. Pandoc is your swiss-army knife. It converts from and to dozens of formats like HTML, markdown, docx, JSON, YAML, and CSV, to name a few.'
     _docs: https://pandoc.org/getting-started.html
     _github: https://github.com/jgm/pandoc
@@ -8755,7 +8759,6 @@ softwarePackages:
     brew:
       - pandoc
       - librsvg
-      - homebrew/cask/basictex
     choco:
       - pandoc
       - rsvg-convert
@@ -9810,14 +9813,18 @@ softwarePackages:
       - cat
       - ls
       - rm
+    _bin:darwin: gchown
     apt: coreutils
+    brew: coreutils
     dnf: coreutils
     pacman: coreutils
   grep:
     _bin: grep
     apt: grep
+    brew: grep
     dnf: grep
     pacman: grep
+    zypper: grep
   wipe-modules:
     _bin: wipe-modules
     _github: https://github.com/bntzio/wipe-modules
@@ -11236,7 +11243,7 @@ softwarePackages:
     _home: https://lapce.dev/
     _name: Lapce
     _app: Lapce.app
-    brew: lapce
+    cask: lapce
     emerge: app-editors/lapce
     flatpak: dev.lapce.lapce
     nix-env: nixpkgs.lapce
@@ -13881,7 +13888,7 @@ softwarePackages:
     pacman: fail2ban
     port: fail2ban
   timewarrior:
-    _bin: timewarrior
+    _bin: timew
     _github: https://github.com/GothenburgBitFactory/timewarrior
     _name: Time Warrior
     apt: timewarrior