From f5133f057e2db227741661ce4f3ca4af5f1d4232 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Fri, 18 Aug 2023 01:38:10 -0400
Subject: [PATCH] Removed taskwarrior from default install and fixed Firefox
 profile issue

---
 home/.chezmoidata.yaml                                       | 3 ++-
 .../universal/run_onchange_after_40-firefox.sh.tmpl          | 2 +-
 home/dot_config/fish/config.fish                             | 5 ++++-
 software.yml                                                 | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 6649a4ff..c448a532 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -408,7 +408,6 @@ softwareGroups:
     - thefuck
     - tldr
     - xdotool
-    - taskwarrior
     - timewarrior
     - tmuxinator
     - up
@@ -1522,6 +1521,8 @@ softwareGroups:
       note: Deprecated in favor of using ASDF.
     - pkg: temps
       note: macOS menu bar app for weather. Buggy software.
+    - pkg: taskwarrior
+      note: Removed from default install because the binary executable conflicts with go-task's binary executable.
     - pkg: termius
       note: Deprecated since all the interesting features require a paid subscription.
     - pkg: ugm
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl
index a3f6b3ec..b3be7205 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl
@@ -103,7 +103,7 @@ function firefoxSetup() {
                     ### Create manifest
                     logg info 'Copying profile switcher configuration to manifest directory'
                     mkdir -p "$MANIFEST_INSTALL_DIR"
-                    cat "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/profile-switcher.json" | sed 's/PATH_PLACEHOLDER/'"$BIN_INSTALL_DIR"'/' > "$MANIFEST_INSTALL_DIR/ax.nd.profile_switcher_ff.json"
+                    cat "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/profile-switcher.json" | sed 's=PATH_PLACEHOLDER='"$BIN_INSTALL_DIR"'=' > "$MANIFEST_INSTALL_DIR/ax.nd.profile_switcher_ff.json"
                 fi
             fi
         elif [ "$SETTINGS_DIR" == "$HOME/.var/app/io.gitlab.librewolf-community/.librewolf" ]; then
diff --git a/home/dot_config/fish/config.fish b/home/dot_config/fish/config.fish
index 3ca0d3d1..265355db 100644
--- a/home/dot_config/fish/config.fish
+++ b/home/dot_config/fish/config.fish
@@ -14,5 +14,8 @@ mkdir -p ~/.config/fish/completions
 carapace --list | awk '{print $1}' | xargs -I{} touch ~/.config/fish/completions/{}.fish # disable auto-loaded completions (#185)
 carapace _carapace | source
 
+### Google Cloud SDK
+[ ! -f "$HOMEBREW_PREFIX/share/google-cloud-sdk/path.fish.inc" ] || source "$HOMEBREW_PREFIX/share/google-cloud-sdk/path.fish.inc"
+
 ### Up
-source ~/.local/share/up/up.fish
\ No newline at end of file
+source "${XDG_DATA_HOME:-$HOME/.local/share}/up/up.fish"
diff --git a/software.yml b/software.yml
index 0e2a0d98..03831a5b 100644
--- a/software.yml
+++ b/software.yml
@@ -4858,7 +4858,7 @@ softwarePackages:
     _name: hiSHtory
     _todo: Check for Homebrew version
     _post: source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/private.sh" && echo y | hishtory init "$HISHTORY_USER_SECRET"
-    script: curl https://hishtory.dev/install.py | python3 -
+    script: curl -sSL --compressed https://hishtory.dev/install.py | python3 -
   git-town:
     _bin: git-town
     _github: https://github.com/git-town/git-town
@@ -9122,7 +9122,6 @@ softwarePackages:
     _when:cask: '! test -d "/Applications/Tailscale.app" && ! test -d "$HOME/Applications/Tailscale.app"'
     cask: tailscale
     choco: tailscale
-
   task:
     _bin: task
     _desc: A task runner / simpler Make alternative written in Go