From 68d7057743d0a63a42b891651d52aba77c742f1e Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Sun, 5 Nov 2023 08:23:25 +0000
Subject: [PATCH] Latest

---
 home/.chezmoidata.yaml                        |  2 +-
 ...n_onchange_after_70-misc-bug-fixes.sh.tmpl |  2 +-
 .../settings/org.gnome.desktop.app-folders    |  2 +-
 software.yml                                  | 24 +++++++++++--------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 1c09d0db..a770a8f4 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -454,7 +454,7 @@ softwareGroups:
   Communication-Desktop: &Communication-Desktop
     - *Communication
     - discord
-    - gitter
+    - element
     - microsoft-teams
     - jitsi-meet
     - keybase
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.sh.tmpl
index c1337ada..3c0bb346 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.sh.tmpl
@@ -121,7 +121,7 @@ sudo cp -f "$SOURCE_DIR/terminator.svg" "$TARGET_DIR/tabby.svg"
 # Cockpit Client - org.cockpit_project.CockpitClient
 # Yubico Authenticator - com.yubico.yubioath
 # OnlyKey App - onlykey-app_onlykey-app
-# Gitter - im.gitter.Gitter
+# Element - im.riot.Riot
 # Jitsi Meet - org.jitsi.jitsi-meet
 # Keybase
 # Nuclear - org.js.nuclear.Nuclear
diff --git a/home/dot_config/dconf/settings/org.gnome.desktop.app-folders b/home/dot_config/dconf/settings/org.gnome.desktop.app-folders
index f121c093..c17d4d15 100644
--- a/home/dot_config/dconf/settings/org.gnome.desktop.app-folders
+++ b/home/dot_config/dconf/settings/org.gnome.desktop.app-folders
@@ -21,7 +21,7 @@ name='Crypto'
 translate=false
 
 [folders/2470d5ec-b93c-4000-ad46-bc667f5fc659]
-apps=['com.discordapp.Discord.desktop', 'im.gitter.Gitter.desktop', 'org.jitsi.jitsi-meet.desktop', 'keybase.desktop', 'com.microsoft.Teams.desktop', 'org.signal.Signal.desktop', 'com.skype.Client.desktop', 'com.slack.Slack.desktop', 'org.telegram.desktop.desktop', 'us.zoom.Zoom.desktop']
+apps=['com.discordapp.Discord.desktop', 'im.riot.Riot.desktop', 'org.jitsi.jitsi-meet.desktop', 'keybase.desktop', 'com.microsoft.Teams.desktop', 'org.signal.Signal.desktop', 'com.skype.Client.desktop', 'com.slack.Slack.desktop', 'org.telegram.desktop.desktop', 'us.zoom.Zoom.desktop']
 name='Social'
 translate=false
 
diff --git a/software.yml b/software.yml
index 45e1d159..b5191188 100644
--- a/software.yml
+++ b/software.yml
@@ -1677,7 +1677,7 @@ softwarePackages:
     _desc: Image compressor that utilizes other applications like ImageOptim under the hood
     _github: https://github.com/ImageOptim/ImageOptim
     _home: https://imageoptim.com/mac
-    brew:darwin: imageoptim-cli
+    brew:darwin-x86_64: imageoptim-cli
     npm:darwin: imageoptim-cli
   cerebro:
     _bin: null
@@ -3520,6 +3520,7 @@ softwarePackages:
     _bin: mailcatcher
     _github: https://github.com/sj26/mailcatcher
     _name: Mail Catcher
+    _service: mailcatcher
     brew: mailcatcher
     gem: mailcatcher
   fpm:
@@ -3896,13 +3897,14 @@ softwarePackages:
     _home: null
     _name: Git Sub Repo
     brew: git-subrepo
-  gitter:
-    _bin: gitter
-    _name: Gitter
-    _when:cask: '! test -d "/Applications/Gitter.app" && ! test -d "$HOME/Applications/Gitter.app"'
-    cask: gitter
-    choco: gitter
-    flatpak: im.gitter.Gitter
+  element:
+    _bin: element
+    _github: https://github.com/vector-im/element-web
+    _name: Element
+    _when:cask: '! test -d "/Applications/Element.app" && ! test -d "$HOME/Applications/Element.app"'
+    cask: element
+    choco: element-desktop
+    flatpak: im.riot.Riot
   github-desktop:
     _bin: github
     _when:cask: '! test -d "/Applications/GitHub Desktop.app" && ! test -d "$HOME/Applications/GitHub Desktop.app"'
@@ -4666,7 +4668,6 @@ softwarePackages:
     apk: hyperfine
     brew: hyperfine
     cargo: hyperfine
-    cask: hyperfine
     choco: hyperfine
     dnf: hyperfine
     github: github.com/sharkdp/hyperfine
@@ -4799,6 +4800,7 @@ softwarePackages:
     _github: https://github.com/ipfs/ipfs
     _home: https://ipfs.tech/
     _name: IPFS
+    _service: ipfs
     brew: ipfs
     choco: go-ifps
     nix: ipfs
@@ -5734,6 +5736,7 @@ softwarePackages:
     _bin: mpv
     _github: https://github.com/mpv-player/mpv
     _name: MPV
+    _todo: This software does not run on macOS versions other than Mojave, Catalina, Big Sur and Ventura --- probably adding support - this issue will likely fix itself
     brew: mpv
     cask: mpv
     choco: mpv
@@ -9193,6 +9196,7 @@ softwarePackages:
     _github: https://github.com/tailscale/tailscale
     _home: https://tailscale.com/
     _name: Tailscale Client
+    _pre:cask: if command -v tailscale > /dev/null; then brew uninstall tailscale; fi
     _when:cask: '! test -d "/Applications/Tailscale.app" && ! test -d "$HOME/Applications/Tailscale.app"'
     cask: tailscale
     choco: tailscale
@@ -10751,7 +10755,7 @@ softwarePackages:
     pacman: tigervnc
     zypper: tigervnc
   proxyman:
-    _bin: proxyman
+    _bin: proxyman-cli
     _github: https://github.com/ProxymanApp/Proxyman
     _name: Proxyman
     _when:cask: '! test -d /Applications/Proxyman.app && ! test -d $HOME/Applications/Proxyman.app'